So I've just imported a git fast-export file into my repository; it's created a completely independent branch which does not share ancestry with my original branch.
I now want to (small-m) merge this in with my main branch --- just adding the files, so that the new commit ends up having the union of my old main branch and the new imported branch, with correct file history. How do I do this? fossil merge won't touch it because my two branches don't share an ancestor. If I force it using --baseline with any of the obvious revisions it just does crazy things. Any suggestions? -- ┌─── ｄｇ＠ｃｏｗｌａｒｋ．ｃｏｍ ───── http://www.cowlark.com ───── │ "There is nothing in the world so dangerous --- and I mean *nothing* │ --- as a children's story that happens to be true." --- Master Li Kao, │ _The Bridge of Birds_
signature.asc
Description: OpenPGP digital signature
_______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
