chiark / gitweb /
git-debrebase: do not bomb on totally ambiguous pseudomerges
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 17 Feb 2018 22:51:16 +0000 (22:51 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 15:06:58 +0000 (16:06 +0100)
Actually, we want `git-merge -s ours' (or `git-debrebase stitch')
to be comprehended.  We sacrifice `git-merge -s theirs'.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase

index 3d83727..932a3b7 100755 (executable)
@@ -461,7 +461,8 @@ sub classify ($) {
        } elsif ($order < 0) {
            @bytime = reverse @bytime;
        } else {
-           return $unknown->('merge of two identical same-age parents');
+           # same age, default to order made by -s ours
+           # that is, commit was made by someone who preferred L
        }
        return $classify->(qw(Pseudomerge),
                           SubType => qw(Ambiguous),