On 12/27/06, Claude Schneegans <[EMAIL PROTECTED]> wrote: > > >>What happens is when developer A commits a file changed by developer B, > he is told there is a conflict, and is prompted to compare the two > versions, generally using diff or some variant of it. > > But this is ridiculous! > So programmer B has to read and check all what programer A has done, and > integrate either his own code into A's file, or A's code ito his own? > During all this, he has to check if every line of code is still > compatible, and during all the time it takes, there is still a chance > programmer C has modify the same file again?
Guess it just really depends on how many developers you have working on the same application. We use Dreamweaver Check-in / Check-out and it's done well for what we need it to do. If I have the file checked out and someone else attempts to download the file, it will download it in a "Locked" version and if they try to edit the file they need to check it out which will tell them I have it checked-out. Now this is where we Skype each other and find out when one or the other is going to be done with the file so the other can do their part. Since we always have multiple projects running concurrently it's not a big deal to drop the project for a bit and get into something else until the file is checked back in. Casey ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~| Create robust enterprise, web RIAs. Upgrade & integrate Adobe Coldfusion MX7 with Flex 2 http://ad.doubleclick.net/clk;56760587;14748456;a?http://www.adobe.com/products/coldfusion/flex2/?sdid=LVNU Archive: http://www.houseoffusion.com/groups/CF-Talk/message.cfm/messageid:265156 Subscription: http://www.houseoffusion.com/groups/CF-Talk/subscribe.cfm Unsubscribe: http://www.houseoffusion.com/cf_lists/unsubscribe.cfm?user=89.70.4
