Ruini Xue ha scritto:
After reading the darcs manual, I do not understand how to merge
conflicts manully after pull?
When there is a conflict, darcs puts some markers in your file,
something like
v v v v v v v
here is some text from one of the tree
* * * * * * *
here is some text modified by a patch
^ ^ ^ ^ ^ ^ ^
Your task is deciding which version should win, or how should look that
piece of code. The conflict will be resolved by the patch you'll record
out of that.
hth,
ciao, lele.
_______________________________________________
darcs-users mailing list
[email protected]
http://www.abridgegame.org/mailman/listinfo/darcs-users
