[darcs-users] Merge and conflicts

Samuel Tardieu sam at rfc1149.net
Thu Mar 4 13:32:34 UTC 2004


I couldn't find in the manual how darcs does when there is a merge
conflict and no merge tool.

Shouldn't darcs put the conflicting patches "on hold" and require a
merger to be committed before going on?

Also, couldn't it use 3 way merge markers in files containing both the
original version, the first patched version and second patched
version, as does arch with "star-merge -t"?

  Sam
-- 
Samuel Tardieu -- sam at rfc1149.net -- http://www.rfc1149.net/sam





More information about the darcs-users mailing list