CODEWITHSUNDEEP
version-controlmercurial
Vincent Catalano
Vincent Catalano

Reputation: 2321

Merging Branch Into default In Mercurial Dropping All default Changes

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 override everything and replace default with the branch. Am I even going about this the right way? Thanks for the help!

Upvotes: 4

Views: 285

Answers (1)

Lasse V. Karlsen
Lasse V. Karlsen

Reputation: 391664

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.

Upvotes: 5

Related Questions