On Mon, Sep 27, 2004 at 04:06:36PM -0400, Andrew Pimlott wrote:
> When conflicting hunks produce the same change, there is a quirk that I
> didn't realize until I reproduced your example. darcs uses diff3 to add
> conflict markers, but when the two conflicting changes are the same,
> diff3 decides they are compatible and adds no conflict marks. Thus,
> whatsnew simply shows the same change that both conflicting patches
> made, which is confusing. Nonetheless, you should just go ahead and
> record this change, and the conflict will be resolved.
Well, that is what you should do if you want to resolve the conflict.
In this case, David will probably not apply your patch, so if you
resolved the conflict you would just have two useless patches (your
original patch and the resolution) in your repo forever (and you would
have to be careful not to push them to David in the future). Probably
better to unpull your patch, ie throw it away, which you will be able to
do after you revert that troublesome conflict resolution.
Ah the joys of distributed revision control. :-)
Andrew
|
