No option to merge into local discarding local changes (i.e. keep "other")
Created originally on Bitbucket by Anonymous
Let's say I have a
default branch and a
somebranch branch. I want to merge them into the
default branch, keeping everything "as is" from the
somebranch branch. That is, wherever there might be any sort of conflict, take the
somebranch version. Override the local version completely.
There should be an obvious no-brainer option to do that from TortoiseHG, and there isn't.
I update to the tip of the
default branch, then I right-click on the tip of the
somebranch branch, and I get the dialog in the attached screenshot. There's an option "discard all changes from the
other revision". That's great, but there should also be an exactly opposite option: "discard all changes from the local revision".
Of course you can just normally merge, and then in the list of conflicting files, choose "keep other" for each one. But you shouldn't have to go through all that.