Reconciling your Workspace

Normally you have access to the Perforce server, which controls read-write permission on files under its control. However, when you cannot connect to your Perforce server, you must set and unset read/write permission manually to modify these files. After working offline (without access to your Perforce server), you need to make sure that you bring your workspace and depot files into accord. To reconcile your workspace and the depot, you need to do the following:

Note: For renamed files, you must integrate the original file to the new filename and delete the original file. See Renaming and moving files or folders for more information.

You can diff your workspace with the depot to detect discrepancies between your workspace and the depot, as follows:

  1. In the workspace pane, context-click the highest-level folder that contains the files and folders you modified and choose Reconcile Offline Work... The Diff dialog is displayed, indicating files that have been added, changed, or deleted.
  2. Examine the workspace diff pane (usually on the right) for the following indicators:
  3. Files you created or renamed in the workspace that are not in the depot

    Files you deleted in the workspace that are still present in the depot

    Files you changed in the workspace but have not checked into the depot

To reconcile your workspace and the depot:

  1. Create one or more changelists containing the modifications as follows:
  2. Submit the changelists.

If other users have also modified and checked in files that you changed, Perforce requires you to resolve the files to ensure that no changes are inadvertently overwritten.