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. Since then, my cron job doing the pull fails (silently because I didn't write it defensive enough), and I get the same old revision all the time. Since I didn't contribute to DVC in that time, I didn't notice. So, my commit comes on top of your uncommited revision, and merging from me tries to re-apply it on your work. Sorry for the trouble. Hopefully, the new revision 346 in my branch should apply painlessly on yours. -- Matthieu _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
