Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

doc: s/origin/upstream/ collaborator guide #12436

Closed
wants to merge 1 commit into from
Closed

doc: s/origin/upstream/ collaborator guide #12436

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions COLLABORATOR_GUIDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,11 +358,12 @@ Checkout proper target branch
$ git checkout master
```

Update the tree
Update the tree (assumes your repo is set up as detailed in
[CONTRIBUTING.md](CONTRIBUTING.md#step-1-fork))

```text
$ git fetch origin
$ git merge --ff-only origin/master
$ git fetch upstream
$ git merge --ff-only upstream/master
```

Apply external patches
Expand All @@ -374,21 +375,21 @@ $ curl -L https://github.com/nodejs/node/pull/xxx.patch | git am --whitespace=fi
Check and re-review the changes

```text
$ git diff origin/master
$ git diff upstream/master
```

Check number of commits and commit messages

```text
$ git log origin/master...master
$ git log upstream/master...master
```

If there are multiple commits that relate to the same feature or
one with a feature and separate with a test for that feature,
you'll need to use `squash` or `fixup`:

```text
$ git rebase -i origin/master
$ git rebase -i upstream/master
```

This will open a screen like this (in the default shell editor):
Expand Down Expand Up @@ -447,7 +448,7 @@ commit logs, ensure that they are properly formatted, and add
Time to push it:

```text
$ git push origin master
$ git push upstream master
```
* Optional: Force push the amended commit to the branch you used to
open the pull request. If your branch is called `bugfix`, then the
Expand Down