On Tuesday, February 12, 2008 at 00:09:40, Matthieu Moy wrote: > Stefan Reichör <[EMAIL PROTECTED]> writes: > > > When I merge from your branch, I get a conflict. > > Bzr tells me that a criss-cross merge occured. The suggestion to use the > > --weave > > parameter for merge does not help. > > OK: actually, in december (revision 295 in your branch), you > uncommited a change that I had already pulled.
Maybe the BZR folks should disallow a uncommit after a push :-) Bye, Robert _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
