On Fri, Mar 4, 2011 at 1:22 PM, Martin Gagnon <eme...@gmail.com> wrote: > On Fri, Mar 4, 2011 at 5:58 AM, Jan Danielsson > <jan.m.daniels...@gmail.com> wrote: >> Hello, >> >> In order to figure out how to do conflict resolution with fossil, I >> created a new repository 'central', I added a file to it, then cloned >> the repository into 'clone1' and 'clone2'. I switched off autosync >> from all three repositories, then I modified the the same line in >> central, clone1 and clone2, and committed the changes. [..epic fail on my part..] > > I've made you test... and after I push from first clone, it give no > error at all like > there's no conflict. But when I look at the main timeline (with fossil ui) > on central, the change from first clone create a new leaf. Without any tag or > branch name.. it fork from previous version into a leaf and both leaf > are in trunk.
Aahhh, I see now. I hadn't understood the concept of a "leaf" node. ...which was sort of an major issue for the conflict management. Thanks for pointing me in the right direction. _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
