cancel
Showing results for 
Search instead for 
Did you mean: 

Git Check in issues in Test Complete

SOLVED
Highlighted
Occasional Contributor

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 are editing the Name Mapping file simultaneously from two different local machines. Now when it comes to check in the code., User A commits her changes and pushes the changes. User B does a pull, gets the new changes and then commits his changes and pushes the code to Git. However, when User A does a pull to get the changes from User B, she finds numerous merge conflicts in the Name Mapping file, as well as some missing tags. User B also sees the corrupted file in his project.

 

I am trying to understand where are we going wrong here and how can we avoid this issue. It forces us to usually revert the changes to the last working Name Mapping file and we lose part of our work in the process. What is the best method to follow to enable smooth source control without merge conflicts?

 

Any help is greatly appreciated!

Tagging @Achoubey to get notified of any response .

1 ACCEPTED SOLUTION

Accepted Solutions
Community Hero

Re: Git Check in issues in Test Complete

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.

 

Regards,
  /Alex [Community Hero]
____
[Community Heroes] are not employed by SmartBear Software but
are just volunteers who have some experience with the tools by SmartBear Software
and a desire to help others. Posts made by [Community Heroes]
may differ from the official policies of SmartBear Software and should be treated
as the own private opinion of their authors and under no circumstances as an
official answer from SmartBear Software.
The [Community Hero] signature is used with permission by SmartBear Software.
https://community.smartbear.com/t5/custom/page/page-id/hall-of-fame
================================

View solution in original post

2 REPLIES 2
Community Hero

Re: Git Check in issues in Test Complete

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.

 

Regards,
  /Alex [Community Hero]
____
[Community Heroes] are not employed by SmartBear Software but
are just volunteers who have some experience with the tools by SmartBear Software
and a desire to help others. Posts made by [Community Heroes]
may differ from the official policies of SmartBear Software and should be treated
as the own private opinion of their authors and under no circumstances as an
official answer from SmartBear Software.
The [Community Hero] signature is used with permission by SmartBear Software.
https://community.smartbear.com/t5/custom/page/page-id/hall-of-fame
================================

View solution in original post

Highlighted
Community Manager

Re: Git Check in issues in Test Complete

Hi @imitra @Achoubey , does this answer your question?

Also, check out comments in this thread for more advice and references: https://community.smartbear.com/t5/TestComplete-General-Discussions/How-to-merge-Namemapping-and-Tes...


Sonya Mihaljova
Community and Education Specialist

Did my reply answer your question? Give Kudos or Accept it as a Solution to help others. ⬇️⬇️⬇️
New Here?
Join us and watch the welcome video:
Announcements
Top Kudoed Authors