I branched from default a few months ago to work on some changes to a project. However, now I want to make the branch I was working on the default branch. I want don't want to "merge" any changes from the new branch into default, I just want to o开发者_如何学Cverride everything and replace default with the branch. Am I even going about this the right way? Thanks for the help!
You can specify a merge tool that does this.
First update to the default branch, then issue:
hg merge OTHERBRANCHNAME --tool internal:other
As always you should experiment in a clone so that you can restart if necessary.
精彩评论