git update via rebase: detect rename-rename conflict.
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Sun, 20 Mar 2011 12:22:00 +0000 (15:22 +0300)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Sun, 20 Mar 2011 12:22:00 +0000 (15:22 +0300)
plugins/git4idea/src/git4idea/rebase/GitRebaseProblemDetector.java

index c7d13a4d9166d210f00fc0e2287cea2d5087d7a0..d039dc41d17b9d15cb722c76aeb6421bb5194abc 100644 (file)
@@ -32,7 +32,10 @@ import java.util.concurrent.atomic.AtomicBoolean;
  * </p>
  */
 public class GitRebaseProblemDetector extends GitLineHandlerAdapter {
-  private final static String[] REBASE_CONFLICT_INDICATORS = {"Merge conflict in", "hint: after resolving the conflicts, mark the corrected paths" };
+  private final static String[] REBASE_CONFLICT_INDICATORS = {
+    "Merge conflict in",
+    "hint: after resolving the conflicts, mark the corrected paths",
+    "Failed to merge in the changes"};
   private static final String REBASE_NO_CHANGE_INDICATOR = "No changes - did you forget to use 'git add'?";
 
   private AtomicBoolean mergeConflict = new AtomicBoolean(false);