Re: [PATCH 2/4] merge-recursive: increase marker length with depth of recursion

On Mon, Oct 15, 2018 at 7:17 PM Junio C Hamano wrote: > > Elijah Newren writes: > > > Would you like me to edit the commit message to include this more > > difficult case? > > Neither. If the "marker length" change is required in a separate > series that will build on top of the current 4-patch

Re: [PATCH 2/4] merge-recursive: increase marker length with depth of recursion

Elijah Newren writes: > Would you like me to edit the commit message to include this more > difficult case? Neither. If the "marker length" change is required in a separate series that will build on top of the current 4-patch series, I think dropping this step from the current series and make i

Re: [PATCH 2/4] merge-recursive: increase marker length with depth of recursion

On Sun, Oct 14, 2018 at 10:12 PM Junio C Hamano wrote: > > Elijah Newren writes: > > > When using merge.conflictstyle=diff3 to have the "base version" be shown > > in conflicts, there is the possibility that the base version itself has > > conflicts in it. This comes about when there are more th

Re: [PATCH 2/4] merge-recursive: increase marker length with depth of recursion

Elijah Newren writes: > When using merge.conflictstyle=diff3 to have the "base version" be shown > in conflicts, there is the possibility that the base version itself has > conflicts in it. This comes about when there are more than one merge > base, and the merging of those merge bases produces

[PATCH 2/4] merge-recursive: increase marker length with depth of recursion

When using merge.conflictstyle=diff3 to have the "base version" be shown in conflicts, there is the possibility that the base version itself has conflicts in it. This comes about when there are more than one merge base, and the merging of those merge bases produces a conflict. Since this process a