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
Best practice is, always, to have a single person maintaining your NameMapping.
However, if you're going to have multiple, don't let the merge happen on the commit, have the merge happen on the pull.
1) Make NameMapping changes
2) Pull latest
3) Reconcile
4) Commit
5) Push
And, something else that has helped us, make small, incremental changes to the mapping. The bigger the mapping change, the more chances there are to end up with conflicts.
Hi tristaanogre ,
We have attempted a similar git workflow, and of course, run into conflicts on the pull. Could you elaborate more on how you reconcile the conflicts you run into? We're afraid of the consequences that could result from attempting to manually resolve each file. These are the files where we run into conflicts:
- .tcNM
- .NMimg
If there's no elegant way to handle this, we will most likely have a single curator handle all of our NameMapping, but that really hampers our productivity. If that person were to be out of the office, then everyone else is kind of left stranded.
Our plan B is similar to what Marsha_Ris doing, where we would pass each other's unique NameMapping files to a single person. Have them merge in each file one-by-one using TestComplete's merging tool, then pass the updated "master" file back out to everyone.
As your title says, you appear to be a real "Community Hero" in these forums, so we appreciate your advice.
Thanks,
Riley M.