From fb01d2daf628b07c936b457f7815a775e87e8009 Mon Sep 17 00:00:00 2001
From: Peter Nguyen <peter@mictis.com>
Date: Sun, 7 Jul 2019 11:09:21 +0200
Subject: [PATCH] git-rebase: Add example with auto-resolve conflicts using
 merge strategy

---
 pages/common/git-rebase.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pages/common/git-rebase.md b/pages/common/git-rebase.md
index 1f43afe211..384d26ba56 100644
--- 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}}`