summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/wrapper.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wrapper.hs b/src/wrapper.hs
index f551572f..08d5176e 100644
--- a/src/wrapper.hs
+++ b/src/wrapper.hs
@@ -125,7 +125,7 @@ setupupstreammaster newref propellordir = do
changeWorkingDirectory tmprepo
git ["fetch", distrepo, "--quiet"]
git ["reset", "--hard", oldref, "--quiet"]
- git ["merge", newref, "--quiet", "-m", "merging upstream version"]
+ git ["merge", newref, "-s", "theirs", "--quiet", "-m", "merging upstream version"]
fetchUpstreamBranch propellordir tmprepo
cleantmprepo