Skip to content

Commit

Permalink
Problem: No explanation how to get rid of merge commits
Browse files Browse the repository at this point in the history
Solution: Explain how to drop them and rebase instead
  • Loading branch information
sappo committed Jul 21, 2016
1 parent 6ff3298 commit 4fe335f
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Expand Up @@ -18,5 +18,11 @@ git fetch upstream
git rebase upstream/master
git push -f

If you are new please have a look at our contributing guidelines:
In case you already merged instead of rebasing you can drop the merge commit.

git rebase -i HEAD~10

Now, find your merge commit and mark it as drop and save. Finally rebase!

If you are a new contributor please have a look at our contributing guidelines:
[CONTRIBUTING.md](https://github.com/zeromq/czmq/blob/master/CONTRIBUTING.md)

0 comments on commit 4fe335f

Please sign in to comment.