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

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}}`