From 5d92ed6ea773ae62344d114e8a1992fd61bd9445 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 19 Aug 2014 17:57:32 -0400 Subject: need to -s theirs or the merge is likely to fail --- src/wrapper.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3