>--- Forwarded mail from [EMAIL PROTECTED] >> Thanks. Looks like merges must be difficult in CVS. A lot of manual >work.
>Oh, do you know of a configuration management system that can read human >minds?=20 >Basically, two changes have been made to the *same spot*: one in your >work area, and one checked in by someone else. Which change should be >kept when you update to the latest version in the repository?=20 >CVS certainly can't guess for you, so it marks it in a conflict block. >So does every other CM system. Well, a lot of other CM systems invoke a graphical merge program in which the user resolves conflicts such as this. But to answer the original poster's question: Yes, there is a workaround. Don't introduce conflicting changes. >--- End of forwarded message from [EMAIL PROTECTED] _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
