Hello
David,
we have been trying.
We are using Subversion and TortoiseSVN as source-control, this is not
integrated in TC. We are using TC with several Named User licenses.
Every user
has his TC-project-Version on his own computer. The problem starts,
when a user
tries to update his version.
Here a short description of how we tried to avoid conflicts:
Developer1 (D1) opens TC-Project (tcp) and adds a keywordtest, checks
in. Developer2
(D2) opens same tcp and updates. No problem. D2 adds keywordtest and
checks in.
D1 updates -> no problem.
D1 changes his test, D2 changes his test. D1 checks in, D2 wants to
checks in.
Now D2 wants to update his version and gets conflicts!!
The conflicted file is the tcCfgExtender. We are not able to relate the
changes
in that file to what has been changed in the individual tests.
When D2 now
resolve the conflict by Choosing the Option “Taking theirs”, D2 has no
problems
to continue his work on his updated version.
Is it possible
to take this file out of source-control or will that raise problems for
using
TC?
