Forum Discussion

imitra's avatar
imitra
Occasional Contributor
5 years ago

Git Check in issues in Test Complete

Hello Everyone!   We have an ongoing issue with checking in our code in Git using Source Control from TestComplete.   Scenario:   User A and User B are both working on the same project, so they...
git
Name Mapping
source control
  • AlexKaras's avatar
    AlexKaras
    5 years ago

    Hi,

     

    In a nutshell: All files that are part of TestComplete's project except (to certain extent) script unit files must be considered as binary files that cannot be merged. The only practically usable approach is to avoid concurrent changes of any file.

     

    Try to search TestComplete section of this forum for example for 'Namemapping merge' phrase - there were quite a few similar topics here. Unfortunately, I don't have links to them at hand, sorry for that.

     

AlexKaras's avatar
AlexKaras
Champion Level 3
5 years ago

Hi,

 

In a nutshell: All files that are part of TestComplete's project except (to certain extent) script unit files must be considered as binary files that cannot be merged. The only practically usable approach is to avoid concurrent changes of any file.

 

Try to search TestComplete section of this forum for example for 'Namemapping merge' phrase - there were quite a few similar topics here. Unfortunately, I don't have links to them at hand, sorry for that.