GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — doc: reorder section on updating PR branch · nodejs/node@142ad8d

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

COLLABORATOR_GUIDE.md

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎COLLABORATOR_GUIDE.md‎`

Copy file name to clipboardExpand all lines: COLLABORATOR_GUIDE.md

+8-8Lines changed: 8 additions & 8 deletions

Display the source diff
Display the rich diff

Original file line number	Diff line number	Diff line change
`@@ -593,20 +593,20 @@ Validate that the commit message is properly formatted using`
`593`	`593`	`$ git rev-list upstream/master...HEAD \| xargs core-validate-commit`
`594`	`594`	```
`595`	`595`
	`596`	`+Optional: When landing your own commits, force push the amended commit to the`
	`597`	+branch you used to open the pull request. If your branch is called `bugfix`,
	`598`	+then the command would be `git push --force-with-lease origin master:bugfix`.
	`599`	`+When the pull request is closed, this will cause the pull request to`
	`600`	`+show the purple merged status rather than the red closed status that is`
	`601`	`+usually used for pull requests that weren't merged.`
	`602`	`+`
`596`	`603`	`Time to push it:`
`597`	`604`
`598`	`605`	```text
`599`	`606`	`$ git push upstream master`
`600`	`607`	```
`601`		`-* Optional: Force push the amended commit to the branch you used to`
`602`		-open the pull request. If your branch is called `bugfix`, then the
`603`		-command would be `git push --force-with-lease origin master:bugfix`.
`604`		`-When the pull request is closed, this will cause the pull request to`
`605`		`-show the purple merged status rather than the red closed status that is`
`606`		`-usually used for pull requests that weren't merged. Only do this when`
`607`		`-landing your own contributions.`
`608`	`608`
`609`		-* Close the pull request with a "Landed in `<commit hash>`" comment. If
	`609`	+Close the pull request with a "Landed in `<commit hash>`" comment. If
`610`	`610`	`your pull request shows the purple merged status then you should still`
`611`	`611`	`add the "Landed in <commit hash>..<commit hash>" comment if you added`
`612`	`612`	`multiple commits.`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.