开发者

Merging Branch Into default In Mercurial Dropping All default Changes

开发者 https://www.devze.com 2023-03-22 17:36 出处:网络
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 f

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.

0

精彩评论

暂无评论...
验证码 换一张
取 消