On Sat, Mar 31, 2012 at 6:06 PM, mlfconv <mlf.c...@gmail.com> wrote: > I'm now at the stage where everything is imported properly and ended up > trying to merge A2 and B2 which resulted in 7 merge conflicts, I'm not sure > how to display them (possibly via web ui) or even better how to replace > that merge with another file, basically ending up with desired fake merge. >
You can't display the conflicts with fossil, but to simply replace the conflicted file, just copy your desired version over it and commit it. There is no "conflict resolution" flag which has to be set like there is in svn. -- ----- stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
