Permalink
Browse files

Updated Contributor Guidelines (markdown)

  • Loading branch information...
1 parent 2ee1e3f commit 85342aa0e736e5c7ff93c918aedf500af6e2db63 @garyrussell garyrussell committed Aug 14, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 Contributor-Guidelines.md
@@ -42,7 +42,7 @@ _you should see branches on origin as well as upstream, including 'master' and '
- Switch back to the topic branch: `git checkout INT-123` (no -b needed since the branch already exists)
- Rebase the topic branch to minimize the distance between it and your recently synched master branch: `git rebase master`
(Again, for more detail see the Pro Git section on rebasing: [http://progit.org/book/ch3-6.html](http://progit.org/book/ch3-6.html))
-* **Note** You cannot rebase if you have already pushed your branch to your remote because you'd be rewriting history (see **'The Perils of Rebasing'** in the article). If you rebase by mistake, you can undo it as discussed [in this stackoverflow discussion](http://stackoverflow.com/questions/134882/undoing-a-git-rebase). You can create another branch from master and then merge in your previously published branch. You can then keep rebasing that new branch until you are ready to publish it.
+* **Note** You cannot rebase if you have already pushed your branch to your remote because you'd be rewriting history (see **'The Perils of Rebasing'** in the article). If you rebase by mistake, you can undo it as discussed [in this stackoverflow discussion](http://stackoverflow.com/questions/134882/undoing-a-git-rebase). Once you have published your branch, you need to merge in the master rather than rebasing.
* Now, if you issue a pull request, it is much more likely to be merged without conflicts. Most likely, any pull request that would produce conflicts will be deferred until the issuer of that pull request makes these adjustments.
* Assuming your pull request is merged into the 'upstream' master, you will actually end up pulling that change into your own master eventually, and at that time, you may decide to delete the topic branch from your local repository and your fork (origin) if you pushed it there.
- to delete the local branch: `git branch -d INT-123`

0 comments on commit 85342aa

Please sign in to comment.