Yeah, that's the way the majority version control systems work. Most of the time it's not an issue, because if two developers are working on the same little block of code, they'll be talking to each other anyway. Machines are really good about merging in changes from disparate sources, as long as the changes aren't all jumbled together.
For example, say I have a file like this: pickle letuce salami pastrami We both check it out, and you're task is to add "cheese" to the list, while mine is to fix the typo in "letuce" to have two 't's. You tack "cheese" onto the end and commit. When I try to commit, the software says "hey, you don't have the most recent changes, would you like to get them?", to which I click "OK". The software sees your change, and notices that it at the end, directly after the "pastrami" line. Since my copy of the file has that same context, it just adds the new cheddar line, and says "Ok, you can commit now". Now if I'd added the missing 't' to "letuce", and at the same time you'd added "iceberg " in front of it, then there'd be a problem, and a manual reconcilliation would be required. However after using CVS (which operates on this model) for several years, I can assure you that those types of conflicts rarely happen. When they do, they're almost always a result of a lack of communication between developers. And the rest of the cases stem from someone leaving uncommitted changes in their working directory for an extended period of time (weeks and weeks), and trying to jump back into the flow of things. 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. cheers, barneyb On 6/20/05, S. Isaac Dealey <[EMAIL PROTECTED]> wrote: > You mean have everyone edit the files simultaneously and then what? > The last person to close it gets to merge everything? That sounds > hideous (if I'm making the right assumption anyway)... But no, I don't > have any say in the source-control decision. -- Barney Boisvert [EMAIL PROTECTED] 360.319.6145 http://www.barneyb.com/ Got Gmail? I have 50 invites. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~| Discover CFTicket - The leading ColdFusion Help Desk and Trouble Ticket application http://www.houseoffusion.com/banners/view.cfm?bannerid=48 Message: http://www.houseoffusion.com/lists.cfm/link=i:4:210040 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
