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,
> 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.
I've also found that the majority of the problematic conflicts are if you're deleting segments of the NameMapping or doing a large re-structuring (click, drag, replace, etc) of existing trees AT THE SAME TIME as others are adding segments to the NameMapping. This creates all SORTS of conflicts. Just having two people adding new objects in different, unrelated trees doesn't cause much problems at all.