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

2019-07-07 11:09:21 +02:00 · 2019-07-07 11:09:21 +02:00 · fb01d2daf6
parent df4bae9a52
commit fb01d2daf6
1 changed files with 4 additions and 0 deletions
--- a/pages/common/git-rebase.md
+++ b/pages/common/git-rebase.md
@ -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}}`