Forum Discussion
Fully on board with AlexKaras on this. File locking is almost a must with many of the files. Things like tcScript and such not so much. NameMapping, however... hoo-boy....
What I've found is that the merging isn't as bad with these files if you're simply adding or modifying data. But, with NameMapping especially, if you delete large chunks of data or move objects around so that there are large changes of "delete from here, add to there", THAT'S where things get ugly.
We've managed to work through this by having our engineers do small, incremental changes. Basically, as soon as you add a new item to NameMapping and Alias it, check it in to source and then re-get the latest to get all current updates. Lather, rinse, repeat. This works fine for adding a new child object, modifying a property value, etc. For larger more "invasive" changes, we establish a file lock to prevent changes until the person is done making those changes.
This all sounds truly horrible and I'm more glad than ever I don't have to deal with merges!
- shankar_r8 years agoCommunity Hero
Hrm...Looks like i will get into a very good bad times when doing merge. But nevertheless I having some options in my plate now, will try to do those if i got any luck then fine otherwise as i say VERY GOOD BAD times. :robotmad:
- Colin_McCrae8 years agoCommunity Hero
Heh.
AlexKaras the other test guys already do help out.
But, because it's a keyword and data driven framework I've set up, they can just make new tests. And I only have to worry about adding new fixtures/functions and areas of the application to the name map.
So it works out nicely for me. :smileyhappy: