Hi guys

I am trying to implement CVS in my current project. However, I sometimes get "conflicts" with it. We are only two developers, and yesterday it "conflicted" on a file that one of us changed, adding one function.

How do I fix a "conflict"? What is it? The file in question is now trahsed, missing functions, etc. and won't compile. It appears that the conflict somehow altered the file, making it unusable.

How do you hande conflicts with CVS? It places =====> tags around innocuous lines that are NOT those added, and that have been in the file for weeks. Why does it do this? How do I fix it?

Thanks

Conflict - occurs when you've changed a file and attempted to book it back into the CVS repository while the version you've changed is not the current version. IE there's a newer version already in CVS.

CVS will place >>> type of markers around what it believes is the code causing the conflict. There should be two sets of these identifiers, one for the version you're trying to check in and one for the version already in the repository.

Resolve by checking the code between these markers and removing the bits that are no longer relevant, along with the markers. You will then need to test if it compiles and book the new file into CVS.

CVS is easy to use, however it requires the developers to make sure they use the system effectively and correctly.

Hope this helps.
Chris

cvs will handle conflicts by adding the =====> and similar signs around the new and old code. it's up to you to determine which to implement and which to remove.

<<<<<<< filename.extension
your recent changes here
=======
the changes submitted since you've edited your file
>>>>>>> 1.2

one way to work around these conflicts is to lock your files through cvs when editing them.

Thanks guys! Now I know exactly what to do.

Apprecations,