Forum Discussion

kylegogtp's avatar
kylegogtp
Contributor
4 years ago
Solved

Issue with empty keyword tests after Source control pull

Version: 14.30.3743 Accepted and merged a PR into master branch. Then pulled down the new changes on a different machine and checkout the master branch the keyword test will be empty. Looking at the...
Keyword Tests
  • kylegogtp's avatar
    kylegogtp
    4 years ago

    I setup TortoiseGIT and integrated into Testcomplete. This found many merge conflicts that I guess just using default GIT setup does not detect.

kylegogtp's avatar
kylegogtp
Contributor

Thanks for the tip and I will compare the files.

 

 That said this was the first branch to go through for changes on this specific test. So, I am not sure where the corruption would have occurred. I agree if 2 people are pushing a change to the same test issues can occur. But this has happened when merging branches that have no other changes happening to that keyword test.

kylegogtp's avatar
kylegogtp
Contributor
4 years ago

I setup TortoiseGIT and integrated into Testcomplete. This found many merge conflicts that I guess just using default GIT setup does not detect.