2 heads but "nothing to merge"

Harvey Chapman hchapman-hg at 3gfp.com
Mon May 16 14:55:28 UTC 2011


On May 16, 2011, at 10:10 AM, Tony Mechelynck wrote:

> I see you already got two answers, but maybe it would be useful to specify a "merge tool" in order to make sure that any differences are resolved in favour of the present code head? IIUC, either
> 
> hg up default
> hg merge -t internal:other code
> hg commit -m 'merge code & default'

What would one have to do to close the "code" branch at the same time in order to have the minimum amount of change to the graph?

Thanks,
Harvey 


More information about the Mercurial mailing list