Testing View Compare/Merge Changes
To use the Test Perspective to test your merge changes, do the following:
- Verify that you have resolved all merge conflicts in the
Compare Perspective or
Merge Perspective of the
View Compare/Merge session.
Note: You cannot check out individual files with merge conflicts in the Test Perspective of a View Compare/Merge session. Resolve all conflicts before using the Test Perspective.
-
Choose VCM Session > Test Perspective and check out the files in your project, including those with merged changes.
View Compare/Merge saves all files locally to a temporary default working folder until you commit the View Compare/Merge session.
Tip: You can specify an alternate View Compare/Merge working folder. Choose VCM Session > Working Folder in the Test Perspective.
- Use your build tools to test that the project will build, run, and has the needed changes.
Note: You cannot build or run from within StarTeam.
- Optionally, switch to the Merge Perspective or the Compare Perspective and make changes as needed.
- Recheck out your project if you have made additional changes, and rerun your tests.
-
Choose VCM Session > Commit Changes when you are satisfied with all the proposed changes.
View Compare/Merge applies all the changes to the StarTeam Server repository and closes the session.