I keep hearing the myth about Git. The issue is not the tools for branching and merging, the issue is working with very large code repositories that are branching and moving forward in all the branches at a fast pace. It has to get merged together at some point and the fact that the code has change dramatically between two or more branches makes the merge hard to accomplish. Git does not solve this problem.
Wil Genovese One man with courage makes a majority. -Andrew Jackson A fine is a tax for doing wrong. A tax is a fine for doing well. On May 6, 2010, at 3:08 PM, Brian Kotek wrote: > > 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:333454 Subscription: http://www.houseoffusion.com/groups/cf-talk/subscribe.cfm Unsubscribe: http://www.houseoffusion.com/groups/cf-talk/unsubscribe.cfm
