ContributionsMost RecentMost LikesSolutionsRe: NameMapping issues with git sourcecontrol This works when you create different projects (eg: one project per module, which is my scenario) under the same project suite. I am now dividing my existing project into smaller projects based on modules. I will merge the new Name Mapping file to the existing Name Mapping file for each project. In my team, I am able to dedicate resources to work on separate modules . This kind of works for me. Not an ideal solution for sure, but kind of a workaround. Re: NameMapping issues with git sourcecontrol Another suggestion from Smart Bear is we create different projects under the same project suite. This will eliminate the need to edit the same Name Mapping file by different users (provided different users are working on different projects). I am currently trying out this method and will see how it goes! Re: NameMapping issues with git sourcecontrol We have faced this issue before and we are still struggling to find an appropriate way to manage Source Control with Test complete. You can try looking at the Name Mapping file and check for merge conflicts, markers like HEAD, <<<<<,>>>>>,======= Hope this helps. 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! TaggingAchoubeyto get notified of any response . SolvedRe: struggling with High maintenance cost due to UI changes Thanks for the detailed expalanationBenoitB. It was certainly helpful! Re: struggling with High maintenance cost due to UI changes BenoitBHow have you identified ZipCode, CardholderSurname . I am fromAchoubey's team, our primary issue is with the identification of the objects. An example code : if(aqObject.GetVarType(primaryEmail)== varEmpty) Log.Message("Incorrect Primary Email is Displayed and Not exactly as per PARIS Database" + " " + primaryEmail); else Log.Message("Correct Primary Email is Displayed as per PARIS Database:" + " " + primaryEmail); Here, we have identifiedprimaryEmail as var primaryEmail = page.EvaluateXPath("//span[text()[contains(.,'abc@optrust.com')]]") or, Sys.Browser("chrome").Page("*").Panel(0).Panel(0).Panel(0).Panel(1).Panel(2).Panel(0).Panel(0).Panel(0).Panel("pi_your_details").Panel(2).Panel(0).Panel(0).Panel(0).Panel(1).Panel(0).TextNode(1)); Both of these codes are vulnerable to UI Changes, the latter being more vulnerable when an accessibility change comes up when there were panels added at almost every ui element. We are looking to understand how to make it more robust. Thanks, I**bleep**a.