P4V User Guide (2019.2)

Resolving streams

Conflicts occur when you attempt to submit a stream that another user has edited and submitted while you had the stream checked out. When a conflict occurs, Helix server schedules the stream for resolve. To indicate that a stream needs resolving, P4V displays a question mark badge Checked out stream with conflicts icon.

When you attempt to submit a changelist containing a stream that must be resolved, P4V displays an error message. You must resolve the changes before you can proceed.

When you are done resolving your changes, you can submit the changelist. For details, see Editing streams.

To resolve a stream:

  1. In the Pending tab, right-click the stream and select Resolve.

    The Resolve dialog opens.

    Resolve Stream dialog
  2. Select the resolve method:

    • Interactive: Default. Opens the Stream: Edit window. You can view diffs in a separate window and, if needed, manually make additional changes.
    • Public (Source): Ignores any edits made in the checked out stream and takes all changes made in the public stream.
    • Checked Out (Target): Accepts all edits made in the checked out stream and ignores any changes made in the public stream.
    • Combine: Combines the path fields of the public and checked out streams and accepts changes made to all other fields in the checked out stream.
  3. Optionally, from the Diff list, select which versions of the stream you want to compare:

    • Base vs Checked Out (Target)
    • Public (Source) vs Checked Out (Target)
    • Base vs Public (Source)

    where:

    • The Base version represents the public have version from which the checked out version is derived.
    • The Public version represents the current public version, or source, which may have changed since the base version was established.

    • The Checked Out version represents a private copy of the base version. As the target version, it now includes the changes you have made.

    P4V displays the versions side by side in P4Merge.

  4. Click Resolve.