[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: [Gnu-arch-users] Re: <<< conflict markers
From: |
Parker, Ron |
Subject: |
RE: [Gnu-arch-users] Re: <<< conflict markers |
Date: |
Fri, 16 Apr 2004 15:27:37 -0500 |
> 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?