In article <[EMAIL PROTECTED]>, Greg A. Woods wrote: >Even locking without lock contention won't solve all conflict >scenarios. Commit wars are possible with any change control process.
Even if you lock an entire repository, you can still get conflicts; conflicts outside of the system. Suppose I have some wonderful plan to implement something, based on my current knowledge of the source code. I sit down to do it, but the repository is locked. Then when it is unlocked, I find that the code has changed in a way that makes it impractical to implement my idea in the same way. I now have to scrap or rework my idea, essentially performing a mental merge. If you exorcise merges from the version control system, you only push them elsewhere. _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
