*Thanks for the quick response but I don't think you answered the question. I was notified of the confict by syncing user 2's repository with the server using the "fossil update" command. Your "then resolve the conflict locally" is what I want information on as there does not appear to be any way to determine what the conflict is. Usually with CVS or subversion you get a copy of the file with a special extension that either tells you that it is the main trunks version of the file. You can then merge it with your version of the file to arrive at a version that is compatible with the server version. Fossil is not doing that for me so how do I resolve a conflict. *user 1 - > change file x user 1 -> fossil commit -m "changes to x " user 1 -> fossil update user 2 -> change file x user 2 -> fossil commit -m "my changes to x" user 2 -> fossil update CONFLICT x
Re: [fossil-users] Conflict resolution Alec Clews Wed, 07 Oct 2009 19:25:19 -0700 You need to sync the server back to the user 2 first, then resolve the conflict locally and push back to server. (I'm guessing this is your 1st time around the block with a DVCS?) 2009/10/8 Carl Jolly <[email protected]>: > I'm at my wits end. I am trying out fossil and I have created two users and > one > server. I have made changes to the same file in both user repositories. I > have updated the server respository with the change from one user and now > when I do an update for the second user I get a CONFLICT message for that > file. This is what I would expect. So now I go to the directory where the > file exists in the 2nd users file system, expecting to find a diff or a > second copy of the file to manually merge but there is nothing. So in fossil > how do you resolve conflicts. I have looked in the documentation and > searched the web for over 2 hrs to try and answer this basic question and I > have found nothing. Hopefully, it means that its something so trivial that > it need no documentation. I hope so! > > Carl > > _______________________________________________ > fossil-users mailing list > [email protected] > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > > -- Alec Clews Personal <[email protected]> Melbourne, Australia. Jabber: [email protected] PGPKey ID: 0x9BBBFC7C blog:http://alecthegeek.wordpress.com/ _______________________________________________ fossil-users mailing list [email protected]
_______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
