(original) (raw)

On 22 August 2013 05:34, Tim Peters <tim.peters@gmail.com> wrote:

Anyone know a reason not to do:

hg -y merge --tool=internal:fail 3.2

instead? I saw that idea on some Hg wiki.

That would be from http://mercurial.selenic.com/wiki/TipsAndTricks#Keep\_.22My.22\_or\_.22Their.22\_files\_when\_doing\_a\_merge. I think it's a perfectly reasonable approach.

I expanded on it a little to make it more general (to choose which parent to discard) in http://stackoverflow.com/questions/14984793/mercurial-close-default-branch-and-replace-with-a-named-branch-as-new-default/14991454#14991454.

Tim Delaney