diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-17 22:51:16 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:06:58 +0100 |
commit | c386ae2688431a622f9d41b3668755420fcbed39 (patch) | |
tree | b8fa63c9356a272da7787296323cba13db5fd673 /git-debrebase | |
parent | ebf4736038f724689ccc6177d222483fd023866d (diff) |
git-debrebase: do not bomb on totally ambiguous pseudomerges
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>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase index 3d83727..932a3b7 100755 --- a/git-debrebase +++ b/git-debrebase @@ -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), |