From ab2ee404b5a8967ca8de066ee40b9b9ad391b0be Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Thu, 12 Jan 2012 00:59:05 +0000 Subject: [PATCH] git: Resolve the ?? 'conflict' by adding. Fixes #509 --- SparkleLib/Git/SparkleRepoGit.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs index e2eda251..ea8f0176 100755 --- a/SparkleLib/Git/SparkleRepoGit.cs +++ b/SparkleLib/Git/SparkleRepoGit.cs @@ -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 (); + } } }