El mar, 28-11-2006 a las 10:36 +0000, Peter Clifton escribió: > On Mon, 2006-11-27 at 22:39 -0500, Ales Hvezda wrote: [snip] > > The question becomes, when do we want to merge it. I would say > > let's merge it as soon as possible and then deal with any issues on > > a case by case bases. Carlos, do you want to do the merge or do you > > want me to do it. I'm fine with it either way. I will be following > > Dan's suggestions on how to merge when doing the glist-dev -> HEAD merge.
Since it seems you are going to talk about branches and merging in the next freedaug meeting, I'd rather wait for your comments. After that, I can try it. Remember it would be the first time I merge a branch... I hope I won't make any mistakes. > > Also, I would rather not create a branch from a branch. Let's branch > > the no_screen coords branch from HEAD once the glist_dev branch has > > been merged to HEAD. Sound good? Comments? Thanks, > > I think that all sounds sensible. Perhaps we don't even need to branch > no_screen coords, but could instead continue from the glist_dev branch. > (Or is that a bad idea?) If you mean continue from the glist_dev branch without merging it to HEAD, then I don't like that. They are different features which shouldn't be mixed. I'd make a no_screen branch after the glist_dev branch is merged to HEAD. Regards, Carlos _______________________________________________ geda-dev mailing list [email protected] http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev
