mirror of https://github.com/CrimsonTome/tldr.git
git-rebase: Add example with auto-resolve conflicts using merge strategy
parent
df4bae9a52
commit
fb01d2daf6
|
@ -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}}`
|
||||||
|
|
Loading…
Reference in New Issue