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 keyword test during my work.
So i manual merged the tcKDT file but the new keywords test were not added to the project.
I manual changed the item number and index to get an unique node. All keywords test are now in the project.
As far as i see it is not possible to add keyword test simultaneously without either manual edit the tcKDT or add the keyword test to the project by hand. Is this correct?
Thanks
Erik
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 keyword test during my work.
So i manual merged the tcKDT file but the new keywords test were not added to the project.
I manual changed the item number and index to get an unique node. All keywords test are now in the project.
As far as i see it is not possible to add keyword test simultaneously without either manual edit the tcKDT or add the keyword test to the project by hand. Is this correct?
Thanks
Erik
