On Sun, Apr 05, 2015 at 12:39:28PM -0700, Matt Welland wrote: > The auto fork merge is the same as the automatic merge that one of the fork > creators would have experienced if they had done their commit a few minutes > later. They would have gotten a "fossil would fork" message, done "fossil > update" (where the merge happens) and committed. If there is a conflict the > auto fork merge would be canceled obviously.
Note that just because a merge passes automatically doesn't mean it did the correct thing. Trying to hide it sounds like a recipe for head aches. Joerg _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
