lilith/tldr
1
0
Fork 0
mirror of https://github.com/tldr-pages/tldr.git synced 2025-07-24 11:15:26 +02:00
Code 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
Show stats 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:
`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}}`