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.
What we did was allow everyone to do their own mapping but not check it in. Then every week or so, (we rotatethis amongst the team because it's a rotten rotten job lol) one person takes everyone's name mapping and merges them one at a time into an empty project and fixes all the conflicts. Then each person gets a copy of the merged mapping and tries their tests and if it works for everyone, it gets checked in.