By and large that's what we do, we have one branch per project. When developers are on the same branch, we try to make the areas of are very limited (working on CFC A, or Method B of CFC C etc). Commits are done specifically on individual files, rather than mass commits. Then first task of each day for me is to update my working copy of the current branch. Also we schedule merges as required so that things do not get too far out of synch, and mutates into something else, like a photogallery, mail client or pron site.
Strange mutation that. larry > -----Original Message----- > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf > Of RADEMAKERS Tanguy > Sent: Thursday, February 08, 2007 11:35 AM > To: cfcdev@cfczone.org > Subject: RE: [CFCDEV] RE: DW vs Eclipse > > > does each dev get her/his own branch, or do all devs work on > the same branch? We do one branch per project, so we get > some flexibility in the order in which we release projects, > but even then we try not to go too long before merging back > to main. Try to do it before branch X mutates into a mail client ;) > > /t > > >-----Original Message----- > >From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf > >Of Lyons, Larry > >Sent: Thursday, February 08, 2007 5:14 PM > >To: cfcdev@cfczone.org > >Subject: RE: [CFCDEV] RE: DW vs Eclipse > > > >The solution we use at ATCC.org is only to work on branches. > Then once > >things have been tested, they are merged back into the head. You > >resolve any conflicts on the head then retest. Once that's been > >approved its deployed to production. > > > >Regards, > >larry > >-- > >Larry C. Lyons > >Web Analyst > >BEI Resources > >American Type Culture Collection > >http://www.beiresources.org > >email: llyons(at)atcc(dot)org > >tel: 703.365.2700.2678 > >-- > > > You are subscribed to cfcdev. To unsubscribe, please follow > the instructions at http://www.cfczone.org/listserv.cfm > > CFCDev is supported by: > Katapult Media, Inc. > We are cool code geeks looking for fun projects to rock! www.katapultmedia.com An archive of the CFCDev list is available at www.mail-archive.com/cfcdev@cfczone.org You are subscribed to cfcdev. To unsubscribe, please follow the instructions at http://www.cfczone.org/listserv.cfm CFCDev is supported by: Katapult Media, Inc. We are cool code geeks looking for fun projects to rock! www.katapultmedia.com An archive of the CFCDev list is available at www.mail-archive.com/cfcdev@cfczone.org
