cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

need to -s theirs or the merge is likely to fail

This commit is contained in:
Joey Hess 2014-08-19 17:57:32 -04:00
parent d289a222d5
commit 5d92ed6ea7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wrapper.hs
View File

@ -125,7 +125,7 @@ setupupstreammaster newref propellordir = do
changeWorkingDirectory tmprepo changeWorkingDirectory tmprepo
git ["fetch", distrepo, "--quiet"] git ["fetch", distrepo, "--quiet"]
git ["reset", "--hard", oldref, "--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 fetchUpstreamBranch propellordir tmprepo
cleantmprepo cleantmprepo