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

git: Resolve the ?? 'conflict' by adding. Fixes #509

Browse source
This commit is contained in:
Hylke Bons 2012-01-12 00:59:05 +00:00
parent 916cd0fa3d
commit ab2ee404b5
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
SparkleLib/Git/SparkleRepoGit.cs
View file

@ -441,6 +441,7 @@ namespace SparkleLib {
// DU unmerged, deleted by us -> Use theirs
// AA unmerged, both added -> Use theirs, save ours as a timestamped copy
// UU unmerged, both modified -> Use theirs, save ours as a timestamped copy
// ?? unmerged, new files -> Stage the new files
//
// Note that a rebase merge works by replaying each commit from the working branch on
// top of the upstream branch. Because of this, when a merge conflict happens the
@ -525,6 +526,16 @@ namespace SparkleLib {
git_rebase_skip.Start ();
git_rebase_skip.WaitForExit ();
}
// New local files
if (line.StartsWith ("??")) {
Add ();
SparkleGit git_rebase_continue = new SparkleGit (LocalPath, "rebase --continue");
git_rebase_continue.Start ();
git_rebase_continue.WaitForExit ();
}
}
}