Click
StarTeam > Update Solution.
StarTeam updates your project source files and the solution/project file with the latest revisions from the repository. If files have
been added to or removed from the project, the local project is updated to reflect these changes. If any files are in a merge
state,
StarTeam asks if you want to merge the files.
If you have a file in a merge state, click
Yes to merge the changes, or click
No to leave the working file unchanged.
When choosing
Yes, the
StarTeam merge utilityStarTeam File Compare/Merge, opens. Resolve all conflicts and apply or remove any other changes as needed. When you have resolved all conflicts, close
StarTeam File Compare/Merge and return to the
Visual Studio.
The
StarTeam Visual Studio Plugin tells you whether you have resolved all conflicts and asks if you wish to save the file. Click
Yes to replace your working file with the merged file. If you click
No, the local working file is not updated, and the file remains in a merge state.