Skip to content

Commit fd8bca0

Browse files
dschodscho
committed
replay: add short-cut: when one merge parent is the same as before, fall
back to 3-way merge of the other parent's pre-/post-replay variants Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent ebdfe0d commit fd8bca0

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

‎TODO‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
if only one of the parents has been rebased (i.e. we're
2+
replaying O with parents P1' and P2) then can we just cherry-pick the merge -
3+
instead of merging P1' and P2, use P1 as the merge-base with O and P1' as the
4+
merge heads?

0 commit comments

Comments
 (0)