On Apr 30, 2016, at 6:55 PM, Scott Robison <sc...@casaderobison.com> wrote:
> > No. If you are on mybranch and you have uncommitted changes, and you run > update trunk, your changes will not be committed to mybranch (effectively > they will be reverted) and then they will be automatically applied to your > working copy of trunk you just updated to. So both merge and update merge into the checked out workspace, they do not merge into a branch in the repo under any circumstances? _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
