Matthieu Moy <[EMAIL PROTECTED]> writes: > 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 ;-).
I also noticed the conflicts during the merge for [EMAIL PROTECTED] The were probably because Matthieu merged some stuff from xtla--main--1.2 and from Masatakes old dvc branch. However, I think merging should work more seamless from now on. > 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). I would like to continue to provide the gnu arch master branch until the bzr support from dvc is good enough to switch to bzr as our revision control backend. Stefan.
