From 654fea839ce2ddf10c222822ef1d3fecbc3d54a5 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Sun, 13 May 2018 23:13:33 +0200 Subject: [PATCH] prefer --- bin/publish-prefixed-rector.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/publish-prefixed-rector.sh b/bin/publish-prefixed-rector.sh index a87b9ff5689..506e345dd90 100755 --- a/bin/publish-prefixed-rector.sh +++ b/bin/publish-prefixed-rector.sh @@ -19,6 +19,6 @@ git fetch origin # Updates origin/master #git rebase origin/master # Rebases current branch onto origin/master # https://demisx.github.io/git/rebase/2015/07/02/git-rebase-keep-my-branch-changes.html -git rebase -Xours origin/master # Rebases current branch onto origin/master, prefers our "master" in conflicts +git rebase -Xtheirs origin/master # Rebases current branch onto origin/master, prefers our "master" in conflicts git push origin master