From 8e4c11cf489419911bb1ae36909e4a33eb41a9ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Mon, 17 Jun 2013 16:39:35 +0200 Subject: [PATCH] Add additional advice about rebasing --- CONTRIBUTING.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.txt b/CONTRIBUTING.txt index 69ae82e2..7275cc30 100644 --- a/CONTRIBUTING.txt +++ b/CONTRIBUTING.txt @@ -41,8 +41,9 @@ For a more detailed discussion, read these :doc:`detailed documents .. note:: - Do *not* ever merge the main branch into yours. If GitHub indicates that - the Pull Request can no longer be merged automatically, rebase onto master:: + Do *not* ever merge the main branch into yours. If GitHub indicates that the + branch of your Pull Request can no longer be merged automatically, rebase + onto master:: git checkout master git pull upstream master @@ -54,6 +55,9 @@ For a more detailed discussion, read these :doc:`detailed documents git add conflict-file1 conflict-file2 git rebase --continue + However, you should only rebase your own branches and must generally not + rebase any branch which you collaborate on with someone else. + Finally, you must push your rebased branch:: git push -f origin transform-speedups