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 .Solved1.5KViews0likes2CommentsUse TortiseGit Client Setting
I have noticed the setting in Options, Use TortiseGit client, keeps getting turned off. Anyone else having this problem? If not, I may have missed setting a .gitignore entry. There are multiple users in the branch currently. Could someone double check me on the file I should be ignoring and the entry I should make in .gitignore? Thanks!Solved2.4KViews0likes9CommentsTell TestComplete not to deal with source control
When I was initially setting up TestComplete, I was poking around in the settings and ran across the Source Control settings. As I recall,the initial setting was something to the effect of "not using source control". I decided to see what would happen if I told it that I was using Git, andI am sorry I did. (I don't want to go into the reasons right now.) Anyway, is there a way to cause TestComplete to forget about my source control system and just keep its hands out of source control altogether?Solved1.2KViews1like1Comment
