On 6/20/05, S. Isaac Dealey <[EMAIL PROTECTED]> wrote: > > So yes, the last person to commit gets to merge, but it > > rarely requires more than clicking an "ok" button. It > > should require testing of the new changes, just like > > you do now, but that's outside the scope > > of the version control software. > > Ahh okay... well that doesn't sound so bad... unfortunately I don't > have any say in the IDE or the source-control decisions... :-(
There's two more characteristics of most concurrent checkout systems (e.g. CVS, Subversion, etc): + *frequent* checkins, which keeps merge conflicts to a minimum + small files, which means less contention for files to checkout/merge In a ColdFusion environment, the only time I tend to get a lot of merge issues is for things like configuration files that tend to change a little faster than the rest of the code, or maybe some of the layout if folks are working simultaneously. As an aside, Subversion 1.2 added reserved checkout (like VSS) as a per-file option, which is really giving the best of both worlds :) > s. isaac dealey 954.522.6080 > new epoch : isn't it time for a change? > > add features without fixtures with > the onTap open source framework > > http://www.fusiontap.com > http://coldfusion.sys-con.com/author/4806Dealey.htm > > > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~| Logware (www.logware.us): a new and convenient web-based time tracking application. Start tracking and documenting hours spent on a project or with a client with Logware today. Try it for free with a 15 day trial account. http://www.houseoffusion.com/banners/view.cfm?bannerid=67 Message: http://www.houseoffusion.com/lists.cfm/link=i:4:210600 Archives: http://www.houseoffusion.com/cf_lists/threads.cfm/4 Subscription: http://www.houseoffusion.com/lists.cfm/link=s:4 Unsubscribe: http://www.houseoffusion.com/cf_lists/unsubscribe.cfm?user=11502.10531.4 Donations & Support: http://www.houseoffusion.com/tiny.cfm/54
