[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Gnu-arch-users] star-merge vs apply-delta

From: Matthieu Moy
Subject: Re: [Gnu-arch-users] star-merge vs apply-delta
Date: Fri, 07 May 2004 12:44:56 +0200
User-agent: Gnus/5.1002 (Gnus v5.10.2) Emacs/21.2 (gnu/linux)

Robert Collins <address@hidden> writes:

> AIUI three-way actually does two things to the patch behaviour
> *) turns on --forward
> *) turns on the <<<, ===, >>> style markers

That's  a side  effect  of the  mechanism,  but the  way  it works  is
actually different. 

--three-way calls diff3 on the common ancestor, your version and mine.
It's not aware of the history  that lead your version and mine to this

Without --three-way, conflicts solved by --forward can come from

* Two  developers doing  the  same  change by  hand  (typically for  a
  trivial bugfix)

* Merging a patch which is actually a merge from you. 

The  usual   star-merge  can   distinguish  the  two   behaviors  with
--skip-present, but diff3 and therefore --three-way can not AFAIK.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]