On 4/3/15, Sean Woods <s...@seanwoods.com> wrote: > 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?
Yes. It happens sometimes, when two separate users try to commit at the same time. See, for example (https://www.sqlite.org/src/timeline?c=2015-03-21+12:22:16). It is harmless. All you have to do is merge the fork back together. -- D. Richard Hipp d...@sqlite.org _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
