On Apr 30, 2016, at 11:27 PM, Scott Robison <sc...@casaderobison.com> wrote:
> > now you're ready to merge to trunk, so > fossil update trunk > MISSING STEP: fossil merge mybranch yep I definitely missed that, thank you. > (resolve merge conflicts and test merged workspace because it is possible > someone slipped another commit in after code review was passed) true dat. Now I just need to make it easy to help them resolve merge conflicts… Locating the common ancestor version of each file to use for the 3 way merge, I guess is the tricky part for that. And I want to figure out a smart way to automate the copying and pasting of ticket uuid into all the commit comments.
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
