Probably won't help right now, but for future reference, Git's branching and merging is like paradise compared to SVN. Might be worth thinking about trying on a future project.
Brian On Thu, May 6, 2010 at 12:34 PM, Jeff Gladnick <[email protected]>wrote: > > We have about 8 or 9 engineers and QA people working on a big cf > application, all stored in SVN. The way we currently handle source control > is at the outset of each mini-project, then one or two developers will > branch the svn and work on that until they're done, then QA will merge the > changes back into the trunk. > > The problem has become, we now have like 30+ branches, about 8 of which are > used regularly, and QA is getting into merge hell. > > So....How do other developers handle svn with large projects and multiple > people? > > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~| Order the Adobe Coldfusion Anthology now! http://www.amazon.com/Adobe-Coldfusion-Anthology-Michael-Dinowitz/dp/1430272155/?tag=houseoffusion Archive: http://www.houseoffusion.com/groups/cf-talk/message.cfm/messageid:333437 Subscription: http://www.houseoffusion.com/groups/cf-talk/subscribe.cfm Unsubscribe: http://www.houseoffusion.com/groups/cf-talk/unsubscribe.cfm
