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
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.
For us, we're using TF Version control and not Git. Small, incremental merges within that tool have been doing well for us. We haven't had any major problems. We don't use the NameMapping imaging. Of course, lately, we've only really had two people doing the work against the NameMapping file so it's really rather easy to track merges and such.
- Marsha_R
Champion Level 3
RileyMartinez Maybe one or two conflicts a month? We're usually working in separate areas of the application so we don't bounce off each other much. They're really pretty easy to fix. It's not as complicated as resolving code conflicts.
Sorry to potentially necro-bump but we are facing the same issue here, and IMO having only one person maintain name mapping is just a work-around to the real problem: TestComplete's approach of using one single monolithic file for the entire name mapping just doesn't scale well. It should be broken up into somewhat of a folder structure or something.
Relying on one person to maintain the name mapping is just inefficient.
Hi,
> It should be broken up into somewhat of a folder structure
Actually, it you stick to this approach now and make an agreement within the team who is supposed to make a changes to this or that part of NameMapping (e.g. one person automates everything along the Order workflow path and another person automates everything along the Payment Accounting path) and you commit as soon as you make a change to NameMapping and verify that the change works for you, well in this case the risk of conflict is rather small.
Obviously, if someone works for 3-4 months within the whole application and then tries to commit, merge conflicts would be hardly resolvable. But I bet that the same situation will be for the source code as well. And even if we talk not about TestComplete but, say, Visual Studio.
