Hi, I have a fossil repository at [1] with two branches, resulting from a fork. I have tried the usual `fossil update` and `fossil merge ID` but I get this message:
cannot find a common ancestor between the current checkout and f7e3308f63 I have tried with the `--baseline ID` as advised in [2], but I get the message "lack both primary and secondary files", no matter the ID of the supposed common ancestor. At [2] there is a reference on shunning artifacts and I may have shunned something here, but I think that merging should work without not shunning as a prerequisite. [1] http://mutabit.com/repos.fossil/dataweek/ [2] https://stackoverflow.com/questions/19104534/fossil-scm-merge-leafs-back-to-trunk How can I merge these branches? Thanks, Offray _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
