Skip to content

Commit 8fdd0db

Browse files
committed
doc: update COLLABORATOR_GUIDE
Updating COLLABORATOR_GUIDE.md to reflect the new workflow for merging PRs with Jenkins.
1 parent 34e25b2 commit 8fdd0db

1 file changed

Lines changed: 18 additions & 5 deletions

File tree

‎COLLABORATOR_GUIDE.md‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44

55
* [Issues and Pull Requests](#issues-and-pull-requests)
66
* [Accepting Modifications](#accepting-modifications)
7-
- [Involving the TC](#involving-the-tc)
7+
* [Involving the TC](#involving-the-tc)
88
* [Landing Pull Requests](#landing-pull-requests)
9-
- [Technical HOWTO](#technical-howto)
10-
- [I Just Made a Mistake](#i-just-made-a-mistake)
9+
* [Landing Pull Requests manually (for emergency only)](#landing-pull-requests-manually-for-emergency-only)
10+
* [Technical HOWTO](#technical-howto)
11+
* [I Just Made a Mistake](#i-just-made-a-mistake)
1112

1213
This document contains information for Collaborators of the Node.js
1314
project regarding maintaining the code, documentation and issues.
@@ -87,6 +88,18 @@ The TC should serve as the final arbiter where required.
8788

8889
## Landing Pull Requests
8990

91+
Pull requests should be landed with Jenkins as documented [here]
92+
(https://github.com/nodejs/node/wiki/Merging-pull-requests-with-Jenkins).
93+
94+
### Landing Pull Requests manually (for emergency only)
95+
All pull requests should be landed via Jenkins, as documented [here]
96+
(https://github.com/nodejs/node/wiki/Merging-pull-requests-with-Jenkins).
97+
However, sometimes emergency situations arise, and manual intervention is
98+
required. Below is a description of a manual procedure for doing the same,
99+
should a manual procedure be necessary. Please don't do this unless there
100+
is an emergency situation for which the collaborators have agreed that
101+
this is necessary.
102+
90103
Always modify the original commit message to include additional meta
91104
information regarding the change process:
92105

@@ -112,7 +125,7 @@ Additionally:
112125
contained (meaning every commit should pass all tests). This makes
113126
it much easier when bisecting to find a breaking change.
114127

115-
### Technical HOWTO
128+
#### Technical HOWTO
116129

117130
_Optional:_ ensure that you are not in a borked `am`/`rebase` state
118131

@@ -217,7 +230,7 @@ Time to push it:
217230
$ git push origin master
218231
```
219232

220-
### I Just Made a Mistake
233+
#### I Just Made a Mistake
221234

222235
With `git`, there's a way to override remote trees by force pushing
223236
(`git push -f`). This should generally be seen as forbidden (since

0 commit comments

Comments
 (0)