sthope/gitea_templates
Template
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14 from tiago/fix/push-force

Browse Source 
Use `git push -f` after rebase
This commit is contained in:
Vahid Panjganj 2017-07-05 21:17:09 +01:00 committed by GitHub
commit 541e768187
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -45,9 +45,9 @@ We use [Feature-branch-workflow](https://www.atlassian.com/git/tutorials/compari
git add <file1> <file2> ... git add <file1> <file2> ...
git rebase --continue git rebase --continue
``` ```
* Push your branch * Push your branch. Rebase will change history, so you'll have to use `-f` to force changes into the remote branch. If someone else is working on your branch, use the less destructive `--force-with-lease` ([Here is why](https://developer.atlassian.com/blog/2015/04/force-with-lease/)).
``` ```
git push git push -f
``` ```
* Make a Pull Request * Make a Pull Request
* Pull request will be accepted, merged and close by reviewer * Pull request will be accepted, merged and close by reviewer