Resolve reporting commands
The following reporting commands are helpful when you are resolving file conflicts:
Command | Meaning |
---|---|
|
Diffs the file revision in the workspace with the last revision you synced, to display changes you have made. |
|
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 |
|
Previews the specified sync, listing which files have conflicts and need to be resolved. |
|
Reports files that have been resolved but not yet submitted. |