beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

repo git: Fix wrong conflicted version being recovered since migration from rebase to merge

Browse source
This commit is contained in:
Hylke Bons 2017-12-16 18:16:21 +01:00
parent 8c8a5a460e
commit c85074b573
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Sparkles/Git/GitRepository.cs
View file

@ -585,8 +585,8 @@ namespace Sparkles.Git {
// The local version has been modified, but the server version was removed
} else if (line.StartsWith ("UD")) {
// Recover server version
var git_theirs = new GitCommand (LocalPath, "checkout --theirs \"" + conflicting_file_path + "\"");
// Recover our version
var git_theirs = new GitCommand (LocalPath, "checkout --ours \"" + conflicting_file_path + "\"");
git_theirs.StartAndWaitForExit ();