We would like to have the ability to maintain two different branches in a Source Control tool (SVN or TFS) and would like to have the capabliity of selectively merging the changes in a file. We are currently running TestStand 2010 SP1.
The TestStand Diff tool is too complex.
Judging from the questions and feedback, there doesn't appear to be an effective way of doing this.
SVN seems to want to check in the ".ini" files like a binary, it won't allow selectively allowing the differences between files.
Has anyone figured out how to do this?
Mike