From 6235495898073220f668d473d94c452b410afb00 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sun, 25 Sep 2016 13:39:41 -0700 Subject: [PATCH 1/2] doc: add optional step to onboarding doc Include information on how to force push to the contributor's own branch so that pull requests show as merged in GitHub interface. --- doc/onboarding.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/onboarding.md b/doc/onboarding.md index 3b0af6b4748c..ff3edafe8686 100644 --- a/doc/onboarding.md +++ b/doc/onboarding.md @@ -184,6 +184,7 @@ Landing a PR * This will automatically close the PR when the commit lands in master. * `Refs: ` * Full URL of material that might provide additional useful information or context to someone trying to understand the change set or the thinking behind it. +* Optional: Force push the amended commit to the branch you used to open the pull request. If your branch is called `bugfix`, then the command would be `git push --force-with-lease origin master:bugfix`. When the pull request is closed, this will cause the pull request to show the purple merged status rather than the red closed status that is usually used for pull requests that weren't merged. You will likely only do this when landing your own contributions. * `git push upstream master` * Close the pull request with a "Landed in ``" comment. From 1bb4990106f3f5f466791b1c1c1c79f202c319a0 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sun, 25 Sep 2016 14:01:30 -0700 Subject: [PATCH 2/2] squash: nit --- doc/onboarding.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/onboarding.md b/doc/onboarding.md index ff3edafe8686..72fce01b337f 100644 --- a/doc/onboarding.md +++ b/doc/onboarding.md @@ -184,7 +184,7 @@ Landing a PR * This will automatically close the PR when the commit lands in master. * `Refs: ` * Full URL of material that might provide additional useful information or context to someone trying to understand the change set or the thinking behind it. -* Optional: Force push the amended commit to the branch you used to open the pull request. If your branch is called `bugfix`, then the command would be `git push --force-with-lease origin master:bugfix`. When the pull request is closed, this will cause the pull request to show the purple merged status rather than the red closed status that is usually used for pull requests that weren't merged. You will likely only do this when landing your own contributions. +* Optional: Force push the amended commit to the branch you used to open the pull request. If your branch is called `bugfix`, then the command would be `git push --force-with-lease origin master:bugfix`. When the pull request is closed, this will cause the pull request to show the purple merged status rather than the red closed status that is usually used for pull requests that weren't merged. Only do this when landing your own contributions. * `git push upstream master` * Close the pull request with a "Landed in ``" comment.