From c386ae2688431a622f9d41b3668755420fcbed39 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 17 Feb 2018 22:51:16 +0000 Subject: [PATCH 1/1] 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 --- git-debrebase | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git-debrebase b/git-debrebase index 3d837272..932a3b7a 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), -- 2.30.2