[IPython-dev] bzr criss-cross merge?!?!
Sun Mar 22 09:23:02 CDT 2009
On Fri, Mar 20, 2009 at 09:26:05PM -0700, Brian Granger wrote:
> I read more about this and have some vague idea of what it means. But
> I don't recall doing anything funny and I have no idea how to go about
> finding the source of this. Does anyone know if I can just ignore
> this, resolve my conflicts and carry on? Any insight from the bzr
> masters among us would be greatly appreciated.
AFAIK, criss-cross merge can be created by doing the same modifications
to 2 branches, and trying to merge them. bzr is clever-enough to figure
It is safe to go on working.
More information about the IPython-dev