I am trying to merge a branch into the trunk. They have no common ancestor.
The branch was created sometime in the past with a simple Ctrl+C and Ctrl+V of the trunk, a practice which, of course, "broke" any future merge operation between the two, as they are not ancestrally related.
I want to replace the trunk with the branch. I do not care about the commit history in the trunk -- it can be ignored and/or erased, if need be. I do care about the commit history in the branch -- it must be available in the "new" trunk.
Any suggestions will be greatly appreciated.
enter image description here
You can use the "Mark as resolved" option to clear the conflict. After that you can merge without the ancestries issues.