On Fri, Apr 3, 2015, at 08:25 AM, Richard Hipp wrote: > On 4/3/15, Sean Woods <s...@seanwoods.com> wrote: > > > > How can I "merge" both of these "branches" back into one trunk? > > "fossil merge" (with no arguments) should merge together all forks of > the branch you are working on.
Thanks, that fixed it. What is this scenario called? Is it a fork? _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
