What is the best branching strategy

The team strategy we used to keep the name mapping straight is to only let one person check it in.   Once every couple of weeks or so, depending on how much work is being done, one person would collect name mapping files from everyone and use an empty project to merge them inside TestComplete.  Then that name mapping is passed back to everyone and they make a backup copy of their own file and then try their tests with the new one.  Once everyone is happy with the new one, it is checked in.   This was rotated amongst the team members so no one got stuck with it all the time.  This also served to make sure that no one's name mapping got changed without their knowledge.

Hi,

I am third to Marsha after Benoit 🙂

In general, test automation is a development process, so the generic development workflow should work for automation as well.

The case is that NameMapping file should be treated as the binary one for all version control systems and should not be merged using their means.

I heard several times that NameMapping merging provided by TestComplete works (and Marsha confirmed this on more time) but never heard that merging by any version control system provided a good result.