Re: questions about merging the facebook patch to tag:mysql-5.1.47

[Konstantin Osipov]

* MARK CALLAGHAN <mdcallag@stripped> [10/06/19 18:29]:
> > Did you make bzr clean-tree --unknown --ignored before the merge?
> I don't think that clean tree has anything to do with it. I can
> reproduce the problem simply by starting with a branch from "-r 3365",
> changing one line in a file added&deleted in "-r 3366" and then
> merging in "-r 3366"


bzr clean-tree helps to do a quick merge if you didn't touch
any InnoDB files.

If you did, the only option is to resolve the conflict by hand.


--