From 673fe98cf55bff64606a8ad807a22ed0cdd0f74d Mon Sep 17 00:00:00 2001 From: Larpon Date: Wed, 1 Jul 2020 13:36:08 +0200 Subject: [PATCH] doc: fix formating of points 7, 8, 9 in Example Workflow section (#5602) --- CONTRIBUTING.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d3c36895fe..f0cc88de54 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -88,14 +88,17 @@ making pullrequests, and you can just do normal git operations such as: 6. `git push pullrequest` # (NOTE: the `pullrequest` remote was setup on step 4) 7. On GitHub's web interface, go to: https://github.com/vlang/v/pulls -Here the UI shows a dialog with a button to make a new pull request based on -the new pushed branch. -(Example dialog: https://url4e.com/gyazo/images/364edc04.png) + Here the UI shows a dialog with a button to make a new pull request based on + the new pushed branch. + (Example dialog: https://url4e.com/gyazo/images/364edc04.png) + 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 commits. + 9. If there are merge conflicts, or a branch lags too much behind V's master, you can do the following: + 1. `git pull --rebase origin master` # solve conflicts and do `git rebase --continue` 2. `git push pullrequest -f` # this will overwrite your current remote branch