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. If the changes can be merged non-destructively, the developer can simply merge all of them, and the combined file is committed. Or he can merge only parts of his changes, or none of them.
This page covers the different "models" (locking vs. merging) better than I could. http://svnbook.red-bean.com/nightly/en/svn.basic.vsn-models.html > -----Original Message----- > From: Claude Schneegans [mailto:[EMAIL PROTECTED] > Sent: Wednesday, December 27, 2006 3:27 PM > To: CF-Talk > Subject: Re: Simple source control > > >>3. They work with their local files as normal, and when they have > changes that are ready to go back into the repository, they "commit" > them. > > Ok, but what happens if two developers have modified the same file? > Isn't there any way they can lock files so that no other developer can > open it for modification? > > -- > _______________________________________ > REUSE CODE! Use custom tags; > See http://www.contentbox.com/claude/customtags/tagstore.cfm > (Please send any spam to this address: [EMAIL PROTECTED]) > Thanks. > > > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~| 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:265140 Subscription: http://www.houseoffusion.com/groups/CF-Talk/subscribe.cfm Unsubscribe: http://www.houseoffusion.com/cf_lists/unsubscribe.cfm?user=11502.10531.4
