Resolve reporting commands

The following reporting commands are helpful when you are resolving file conflicts:

Command Meaning

p4 diff [filenames]

Diffs the file revision in the workspace with the last revision you synced, to display changes you have made.

p4 diff2 file1 file2

Diffs two depot files. The specified files can be any two file revisions and different files.

When you diff depot files, Helix Server uses its own diff program, not the diff program configured by setting P4DIFF.

p4 sync -n [filenames]

Previews the specified sync, listing which files have conflicts and need to be resolved.

p4 resolved

Reports files that have been resolved but not yet submitted.