Hi there, GIT has a useful merge strategy "git merge -s ours" that always chooses our current version over the version being merged in. The resulting merge has exactly the same files contents as its base parent. The only difference being that the commit merged in is now added to the list of merge parents.
How to achieve the same effect in fossil?? For those who wonder why do I need such a thing here is a use case. I tend to commit very often. In order to prevent polluting public branches I work mostly on private branches periodically merging the changes (when they are in good shape) into public branches. When merging private branch into a public one fossil does not record private branch as a merge parent (and for a good reason!). Often I do have a suitable merge parent candidate. How do I trick fossil into just adding a commit into manifest's "P" card to make it a merge parent?? --Leo-- _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
