On Mon, 13 Dec 2010 09:51:46 +0100 >>>>>> "Lluís" == Lluís Batlle i Rossell wrote:
Lluís> Monotone has very careful ways of interaction for merge Lluís> conflicts: Lluís> http://www.monotone.ca/docs/Merge-Conflicts.html +1 to take closer look at Monotone's handling of conflicts. Lluís> For fossil, by now, I think at least a merge conflict should be Lluís> noted. By now the best I think should be to write appropiate Lluís> notes in the working directory file, as in the case of usual Lluís> merge conflicts. The notes could tell whatever happened. I tend to agree with the above's proposal. Sincerely, Gour -- Gour | Hlapicina, Croatia | GPG key: CDBF17CA ----------------------------------------------------------------
signature.asc
Description: PGP signature
_______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
