Masatake YAMATO <[EMAIL PROTECTED]> writes: > I have a very fool question. > > Who's archive is dvc's master tree? > It seems that I believed [EMAIL PROTECTED] was the > master tree. However, today I got many conflicts with my patches.
Indeed, it was supposed to be, but I didn't quite follow the rule (back to the old good time of anarchy-style version-control ;-). Also, it seems that in some situation, "baz merge --star-merge" does a better job than "baz merge". > We should [EMAIL PROTECTED] is our > master tree? This one is the main archive for Xtla, but my dvc--main--0 is up-to-date today. Let's say that Stefan's tree is actually the master one (however, I can come back as the master archive if you want). -- Matthieu
