).
>> I understand, but I don't know of any examples on the Wiki yet.
>
> E.g. in a merge from A to B, we can simply take the merge
> result of the last B to A merge if there were no later changes
> on either side and the B -> A merge did not cherry-pick
> (with respect
e merge
result of the last B to A merge if there were no later changes
on either side and the B -> A merge did not cherry-pick
(with respect to the node in question).
I propose to use the following two-phase merge workflow:
(1) Planning phase
- read / evaluate the merge info and change histor
t an optimized
> merge plan (see wiki for various examples).
I understand, but I don't know of any examples on the Wiki yet.
> I propose to use the following two-phase merge workflow:
>
> (1) Planning phase
> - read / evaluate the merge info and change history
>
lity of
merge conflicts and their likelihood to show up again
after each conflict resolution. Moreover, it masks cases
where Symmetric Merge might select an optimized
merge plan (see wiki for various examples).
I propose to use the following two-phase merge workflow:
(1) Planning phase
- read / eval
4 matches
Mail list logo
