Hi all,

We are using CVS for version control system. Since QTP is automatically creating action folder like (Action 0, Action 1 ....etc) when two people work in a same test folder and create different actions and try to check in to CVS it is asking for merge which is not possible because say for example Action 1 in X system is different from Action 1 in Y system.

Please let me know if any one has faced this situation and got a solution to handle this.