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

[Parker, Ron]

> From: Stefan Monnier [mailto:address@hidden

> > 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.

Would the tag have to be committed before the apply-delta was done, or could
they be a single commit?