Name Mapping merge conflict
we are 3 team member and we are new to Keyword test. We are working on same project suite cloned from git master. We are having merge conflict every time we try to pull latest code from master to our...
Forum Discussion
Here's how we did it with 3 people working on related areas:
Every two weeks, one of us would take the name mappings from the others and merge them inside TestComplete in a sandbox copy of the project and resolve the conflicts. Then all three would try and run their tests with the new name mapping and we would resolve any remaining problems. That group copy is what got added to the git master.
Pick the time period that works for you. We traded the job around between the three of us so that no one person got stuck with it every time.
Thank you for sharing your idea
