[Gnu-arch-users] Re: <<< conflict markers

[Julian T. J. Midgley]

In article <address@hidden>,
Stefan Monnier  <address@hidden> wrote:
>> Using abbreviated syntax here.  Given:
>
>>   /----------------tag-----------------\
>>  /                                      \
>> p5--commit--p6(bad)--commit--p7--commit  p8--commit--p9
>>                \             /                       /
>>                 \---delta---/                       /
>>                          \-------------apply----------/
>
>But that's not as clean since you end up reverting p7 temporarily as well.
>

And of course if the p6-p7 changes were dependent on the p5-p6
changes, it's a way off being a sensible thing to do (or rather, there
will be some entertaining conflicts to resolve).

Julian


-- 
Julian T. J. Midgley                       http://www.xenoclast.org/
Cambridge, England.
PGP: BCC7863F FP: 52D9 1750 5721 7E58 C9E1  A7D5 3027 2F2E BCC7 863F