Skip to main content
IBM 
ShopSupportDownloads
IBM HomeProductsConsultingIndustriesNewsAbout IBM
IBM : developerWorks : Linux : Education - online courses
CVS for the developer or amateur
Download tutorial zip fileView letter-sized PDF fileView A4-sized PDF fileE-mail this tutorial to a friend
Main menuSection menuGive feedback on this tutorialPreviousNext
3. CVS for developers
  


An example conflict page 17 of 25


Because this file is modified nearly every time a developer makes a major change to CVS, it's a primary source of conflicts -- here's an example conflict. Let's say I add the following lines to the top of the ChangeLog:


date 25 Feb 2001
 
This is the thing I added myself

However, let's say that before I'm able to commit these three new lines, another developer adds these lines to the top of the ChangeLog and commits his changes:


date 25 Feb 2001
 
This is the part added by another developer

Main menuSection menuGive feedback on this tutorialPreviousNext
PrivacyLegalContact