I have the three way merge window open in Mercurial:
local base other
- I was on branch A:
hg update A.
- I want to merge with branch B :
hg merge B
Quiero saber que es
Yo leo esto ¿Cómo funciona la fusión de 3 vías en Mercurial / Meld? pero no pudo conseguirlo.
Now I want to know which file from
other I need to save? Do I need to make all files the same? Will this change files in other branches or it will only save in my current branch A only, and other branches won't be touched?
preguntado el 09 de septiembre de 13 a las 02:09
En tu ejemplo:
localis the last changeset on branch A.
otheris the last changeset on branch B.
baseis the newest changeset which is an ancestor of the both branches.
If you just do the commands that you listed above (
hg update A,
hg merge B) then you won't get a choice of which files to take because Mercurial will make that choice for you where it can.
The only time that you'll need to make a decision is if a file has been changed in both branches in a way that Mercurial can't automatically resolve. In that case, you'll be presented with your merge program of choice to resolve the conflicts. You have to look at the changes made in each branch and manually decide how they need to be combined. If another developer made one of the changes then you might need to ask them to help with the merge.
Si lo hace
hg update A,
hg merge B then the only branch that will be affected is A.