vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

doc: fix formating of points 7, 8, 9 in Example Workflow section (#5602)

pull/5604/head
Larpon 2020-07-01 13:36:08 +02:00 committed by GitHub
parent aec3ea5d32
commit 673fe98cf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTING.md
View File

@ -91,11 +91,14 @@ making pullrequests, and you can just do normal git operations such as:
Here the UI shows a dialog with a button to make a new pull request based on Here the UI shows a dialog with a button to make a new pull request based on
the new pushed branch. the new pushed branch.
(Example dialog: https://url4e.com/gyazo/images/364edc04.png) (Example dialog: https://url4e.com/gyazo/images/364edc04.png)
8. After making your pullrequest (aka, PR), you can continue to work on the 8. After making your pullrequest (aka, PR), you can continue to work on the
branch `fix_alabala` ... just do again `git push pullrequest` when you have more branch `fix_alabala` ... just do again `git push pullrequest` when you have more
commits. commits.
9. If there are merge conflicts, or a branch lags too much behind V's master, 9. If there are merge conflicts, or a branch lags too much behind V's master,
you can do the following: you can do the following:
1. `git pull --rebase origin master` # solve conflicts and do 1. `git pull --rebase origin master` # solve conflicts and do
`git rebase --continue` `git rebase --continue`
2. `git push pullrequest -f` # this will overwrite your current remote branch 2. `git push pullrequest -f` # this will overwrite your current remote branch