Ruini Xue ha scritto:
Do you mean that I have to merge them by hand rather than with some tools?
Yes, but I think there's an option to pull to use an external merger
If I decide to delete the patch, should I change: v v v v v v v here is some text from one of the tree * * * * * * * here is some text modified by a patch ^ ^ ^ ^ ^ ^ ^ to here is some text from one of the tree by removing everything else? Then I record this as a new patch?
Yes, this simple fact will tell darcs how the two conflicting patches should be resolved.
ciao, lele. _______________________________________________ darcs-users mailing list [email protected] http://www.abridgegame.org/mailman/listinfo/darcs-users
