If you setup proper branching in git, and use Test Completes name mapping merge feature instead of git's merge feature this would solve your issues.
Each project within a suite can have it's own NameMapping file. However, any applications that you need to interact with within that project are mapped within that singular file. So, no, you cannot have multiple name mappings files per project.
Hmmm that sounds bad . Anyway thanks for your reply
Actually, no... it's not bad. Each application you work with in the NameMapping file has it's own node tree.
Aliases.App1
Aliases.App2
Aliases.App3
So, internally in the NameMapping file, they are distinct. There really is no technological need for having multiple files.
Can you describe why you need it? Perhaps there's another solution that can be applied.
Actually we were the team of 4 working on the same project but with 4 different tested apps. Whenever we try to merge our code in git we are getting merge conflicts. Resolving merge conflicts on testscripts is not a tedious one but resolving conflicts on 'Namemapping' file was a real headache. However having separate namemapping file for each app can atleast ease our job and less chances of getting merge conflicts.
