2. Right-click and choose Edit from the context menu.
5. Right-click and choose Keep from the context menu.
7. Right-click and choose Promote from the context menu.
8. Switch to your second workspace, and click the edited file’s folder in the Folders pane. Don’t perform an Update.
9. Edit the same file in the second workspace.The file’s status now includes the indicator (overlap). The yellow highlight emphasizes this status. This means that someone else has promoted a version before you did. In this case, the “someone else” is you, working in your first workspace. The file in your second workspace requires a merge before you can promote it.
10.
11. Right-click and choose Merge from the context menu.
12. Proceed to merge the file, using the graphical Merge tool. Use the up () and down (
) toolbar buttons to navigate from conflict to conflict; use the left (
) and right (
) buttons to resolve the current conflict by selecting text from one of the versions. You finish the Merge by preserving the merged file, selecting Keep & Exit when all the conflicts have been resolved.
See the topic “The AccuRev Merge Tool” in the AccuRev online help (in your AccuRev install directory under doc/WebHelp/Merge_Tool_AccuRev.htm ).
13.
AccuRev, Inc. |
Phone: 781-861-8700 |
Fax: 781-861-8704 |
support@accurev.com |