How does CVS conflicts work & howto fix?
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?