On Wed, Mar 11, 2015 at 8:25 AM, Richard Hipp <d...@sqlite.org> wrote: > On 3/11/15, David Mason <dma...@ryerson.ca> wrote: >> I have several students who, through some problem while cloning the >> fossil I created for them, created a parallel timeline. (see >> screenshot) > >> I want to merge them, but fossil merge says there's no head to merge. >> The commits by the student are on the right and are not tagged as >> trunk, but tagging them as such doesn't seem to help. Using >> --baseline in merge didn't help either. > > I was about to suggest using --baseline. What is the exact > command-sequence that you used? And how do you know it didn't work - > did it give an error?
I wonder if merging by exact sha-hash would work ? -- Andreas Kupries Senior Tcl Developer Code to Cloud: Smarter, Safer, Faster™ F: 778.786.1133 andre...@activestate.com, http://www.activestate.com Learn about Stackato for Private PaaS: http://www.activestate.com/stackato _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
