DawnMagnet/tldr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git-rebase: Add example with auto-resolve conflicts using merge strategy

Browse Source
This commit is contained in:
Peter Nguyen
2019-07-07 11:09:21 +02:00
committed by Starbeamrainbowlabs
parent df4bae9a52
commit fb01d2daf6
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pages/common/git-rebase.md
View File

@@ -31,3 +31,7 @@
- Reapply the last 5 commits in-place, stopping to allow them to be reordered, omitted, combined or modified: - Reapply the last 5 commits in-place, stopping to allow them to be reordered, omitted, combined or modified:
`git rebase -i {{HEAD~5}}` `git rebase -i {{HEAD~5}}`
- Auto-resolve any conflicts by favoring the working branch version (`theirs` keyword has reversed meaning in this case):
`git rebase -X theirs {{master}}`