Unverified Commit 55be8f1c authored by Luca Boccassi's avatar Luca Boccassi Committed by GitHub

Merge pull request #3058 from dwijnand/patch-1

Fix formatting in CONTRIBUTING
parents 69a894e1 e6dc9605
...@@ -21,14 +21,18 @@ Please avoid sending a pull request with recursive merge nodes, as they ...@@ -21,14 +21,18 @@ Please avoid sending a pull request with recursive merge nodes, as they
are impossible to fix once merged. Please rebase your branch on are impossible to fix once merged. Please rebase your branch on
zeromq/libzmq master instead of merging it. zeromq/libzmq master instead of merging it.
```
git remote add upstream git@github.com:zeromq/libzmq.git git remote add upstream git@github.com:zeromq/libzmq.git
git fetch upstream git fetch upstream
git rebase upstream/master git rebase upstream/master
git push -f git push -f
```
In case you already merged instead of rebasing you can drop the merge commit. In case you already merged instead of rebasing you can drop the merge commit.
```
git rebase -i HEAD~10 git rebase -i HEAD~10
```
Now, find your merge commit and mark it as drop and save. Finally rebase! Now, find your merge commit and mark it as drop and save. Finally rebase!
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment