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
