Weird failure of a merge to local branch

Eli Zaretskii eliz at gnu.org
Mon Dec 6 20:44:22 GMT 2010


> Date: Mon, 06 Dec 2010 09:57:47 -0500
> From: Aaron Bentley <aaron at aaronbentley.com>
> 
> >  . Revert to the revision before the merge, and try "bzr merge" again
> >    (same question)
> 
> 
> Yes, after deleting the pending-deletion directory.

Thanks, that worked, but produced 4 conflicts (probably because there
were some non-trivial changes on the mainline in the meantime: a few
files got erroneously deleted and then restored).  I resolved the
conflicts by simply copying the files from the parent branch -- is
that TRT?

Also, I'm curious why "bzr status" after the failed merge suggested to
run "bzr update" -- would that have helped as well?

TIA



More information about the bazaar mailing list