diff options
| author | Joey Hess <joey@kitenet.net> | 2014-08-19 17:57:32 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-19 17:57:32 -0400 |
| commit | 5d92ed6ea773ae62344d114e8a1992fd61bd9445 (patch) | |
| tree | 7177f6b64fff825baf4dd1e94df721abd08276a2 /src | |
| parent | d289a222d5915e9307e0e7a9a51f342942a2fe2d (diff) | |
need to -s theirs or the merge is likely to fail
Diffstat (limited to 'src')
| -rw-r--r-- | src/wrapper.hs | 2 |
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 |