generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-12 10:33:52 +01:00
Code Issues Projects Releases Wiki Activity

Fix formatting in CONTRIBUTING

Browse Source 
Avoids the git instructions being all on one line.
This commit is contained in:
Dale Wijnand 2018-04-27 17:57:07 +01:00 committed by GitHub
parent 69a894e1cb
commit e6dc9605a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/PULL_REQUEST_TEMPLATE.md vendored
View File

@ -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!