Cvs commit file had a conflict

Tortoise Tip: Someone else has committed a new version of one or more of the files you are trying to commit. You need to do a CVS Update and then try to commit again. So what do you do? But Word can do the merge for you! So if you have a conflict with a Word document, do the following:.

Alternately, you can just implement file locking a. Sign up or log in Sign up using Google. Sign up using Facebook. Sign up using Email and Password. Post as a guest Name. Email Required, but never shown. The Overflow Blog. Podcast Making Agile work for data science. Stack Gives Back Featured on Meta. New post summary designs on greatest hits now, everywhere else eventually.

Related Hot Network Questions. Question feed. Stack Overflow works best with JavaScript enabled. Accept all cookies Customize settings. What should I do? Improve this question. Add a comment. Active Oldest Votes. You can get out of this situation, when you move your own subdir1 out of the way do cvs up move the content of subdir1 into the CVS-subdir1 check for differences.

Improve this answer. Rudi Rudi The final solution is : 1. Save your local code to another place manually 2. Add back your change to the Reverted file. Community Bot 1 1 1 silver badge. Kevin Kevin 1, 13 13 silver badges 14 14 bronze badges.