|
| From: | Stefan Monnier |
| Subject: | Re: [Gnu-arch-users] Re: <<< conflict markers |
| Date: | 16 Apr 2004 16:31:58 -0400 |
| User-agent: | Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50 |
> 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.
Stefan
| [Prev in Thread] | Current Thread | [Next in Thread] |