Merge problem with tcKDT
Hi, we just started to use Keyword TestComplte (8.5) in a team with subversion. To commit my changes i did a update and get a conflict in the tcKDT file. There were added some new keywor...
Forum Discussion
AlexeyKryuchkov
Alumni
AlumniHi Erik,
Such files are XML files with a specific internal structure, so SVN clients can't merge changes correctly. Thus, we recommend avoiding merging them. Try using the advice from the "How to Organize Simultaneous Work With Shared Projects" help topic instead.
Such files are XML files with a specific internal structure, so SVN clients can't merge changes correctly. Thus, we recommend avoiding merging them. Try using the advice from the "How to Organize Simultaneous Work With Shared Projects" help topic instead.