NameMapping File and Git Source Control
Hello -
We use Bitbucket and Git Bash for all of our source control needs. We just started a proof of concept with TestComplete for a desktop Java application and are trying to establish our best ...
Forum Discussion
What has worked for us is to use your approach of using Test Completes built-in merge tool, but we also heavily use branches for any of our work so it minimizes the chance of conflicts.