- Accept Source: Replaces the copy of the file in your workspace with the version that is in the depot, discarding your changes.
- Accept Target: Accepts the file that is in your workspace, overwriting the version that is in the depot when you submit the file.
- Accept Merged: Replaces the file in your workspace with the merged result of the two files listed in the box at the top of the screen.
- Run Merge Tool: Open the merge tool to edit the file and save the merged result (P4Merge is the default merge tool, but you may have chosen another tool in P4V Preferences).
- Safe automatic resolve (no merging): Accepts the source file (the file in the depot) if it has the only changes. Accepts the target file (the file in your workspace) if it has the only changes. Doesn’t resolve if both the source and target have changed.
- Automatic resolve (allow merging): Accepts the source if it has the only changes. Accepts the target file if it has the only changes. Merges changes if both the source and target have changed and there are no conflicts.
- Automatic resolve (allow merging with conflicts): Accepts the source if it has the only changes. Accepts the target file if it has the only changes. Creates a merged file if both the source and target have changed, even if there are conflicts. Where there are conflicts, both versions are included with text notations indicating the conflicts.
As each file is resolved, it is removed from the list of Files to resolve.
Note :- The file revision that was most recently synced to your client workspace is the base file revision. If the base file revision for a particular file in your workspace is not the same as the head revision of the same file in the depot, you must perform a resolve the new file revision can be accepted into the depot.