xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 03:12:30 +00:00
Code Issues Releases Wiki Activity

Update pull_request.rst

Browse Source 
Add '-f' for 'git push' after changed the commit by 'git rebase' or 'git commit --amend'
This commit is contained in:
Xiaopeng Wang
2015-09-23 15:50:20 +08:00
parent a5201e028a
commit 1bf7d6c506
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/source/developers/github/pull_request.rst
View File

@@ -33,7 +33,7 @@ After submitting a pull request, you may get comments from reviewer that somethi
#. Push the new commit to remote repository. Then the commit will be displayed in pull request automatically. ::
$git push origin <mybranch>
$git push origin <mybranch> -f
Resolving Conflit in the Pull Request
------------------------------------
@@ -63,7 +63,7 @@ During the reviewing of your pull request, some one may change certain code whic
#. Push the change to the remote repository ::
$git push origin <mybranch>
$git push origin <mybranch> -f
Then you will see the pull request is enabled to be merged automatically.