I would like one branch that I have been working on to override the current trunk on my fossil repository, and I wonder is there an option for this?
Currently when I merge the leaf of a branch into the current trunk I get Merge conflict markers in the file. There are a lot of files and I know the changes from my branch are correct. Is there a way I can force the merge in fossil to use the change from the branch when a conflict occurs?