Hi Harvey, and thank you for the welcome!
We have added our RoboHelp project to Microsoft Visual Studio
Team Server for a couple of reasons. The first is to make sure we
don't lose our work if one of our computers crashes. The other
reason is that we are storing our project in the directory with the
code for the software, so that we (our architects) can integrate it
into the software build process. That part is beyond me.
So, to answer your question, we can both check the files out
without locking them, and then we can each work on our own sections
without any problems. The .cpd file does not give us the same merge
choices as other "conflicts" do. For example, if my coworker
creates a new topic and then checks her code in before I check mine
in, when I try to check mine in it says there's a conflict - that
such and such a file exists on the server. Then it gives me the
option of merging it in with my version of the project since I
didn't have it before. With the .cpd file, I don't get the option
to merge her changes in with mine. My two options are to discard
the server changes (hers) or undo my local changes. Either way it
seems like we're losing something.
I think what Leon said about that file not being added to
source control seems correct. However, if all the rest of the
project is in source control, and that one is not, and my coworker
and I have 2 different versions on our machines, what happens when
we go to compile our help? Wouldn't that file need to be in the
same location as the rest of the project files?
Unless we can figure this out, we have decided to take a copy
of the project and put it out on another computer that gets backed
up regularly. We can work on it there without source control, and
then replace the source control project with the newer version on a
regularly scheduled basis. Hopefully that will work.
I appreciate all the feedback!