From 55d87a0dad3c96aa4f19d1e3a39867e6ad0510b4 Mon Sep 17 00:00:00 2001 From: Refael Ackermann Date: Fri, 21 Sep 2018 16:35:38 -0400 Subject: [PATCH 1/3] doc: improve instruction to purple merge --- COLLABORATOR_GUIDE.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index 0c03e89a077252..900ff090116e19 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -698,9 +698,10 @@ $ git rev-list upstream/master...HEAD | xargs core-validate-commit Optional: When landing your own commits, 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. +Don't manually close the PR, GitHub will close it automatically later after you +push it upstream, and will mark it with the purple merged status rather than the +red closed status. If you close the PR before GitHub adjusts its status, it will +show up as a 0 commit PR and the changed file history will be empty. Time to push it: From 289a0bedc690bcbec577f9a0f697941f1a6fbdfa Mon Sep 17 00:00:00 2001 From: Refael Ackermann Date: Fri, 21 Sep 2018 19:49:12 -0400 Subject: [PATCH 2/3] fixup! explicit order --- COLLABORATOR_GUIDE.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index 900ff090116e19..2d01f3feb190c9 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -701,7 +701,9 @@ then the command would be `git push --force-with-lease origin master:bugfix`. Don't manually close the PR, GitHub will close it automatically later after you push it upstream, and will mark it with the purple merged status rather than the red closed status. If you close the PR before GitHub adjusts its status, it will -show up as a 0 commit PR and the changed file history will be empty. +show up as a 0 commit PR and the changed file history will be empty. Also if you +push upstream before you push to your branch, GitHub will close the issue with +red status so the order of operations important. Time to push it: From 1ec2387e0bc6b848bff578f6fa1d640146410f85 Mon Sep 17 00:00:00 2001 From: Refael Ackermann Date: Mon, 24 Sep 2018 17:44:55 -0400 Subject: [PATCH 3/3] fixup2 --- COLLABORATOR_GUIDE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index 2d01f3feb190c9..5e9b2fd59e4433 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -703,7 +703,7 @@ push it upstream, and will mark it with the purple merged status rather than the red closed status. If you close the PR before GitHub adjusts its status, it will show up as a 0 commit PR and the changed file history will be empty. Also if you push upstream before you push to your branch, GitHub will close the issue with -red status so the order of operations important. +red status so the order of operations is important. Time to push it: