How can I fix 'not mergeable' errors in a review?

The problem can occur when you attempt to Commit or Approve and Commit via the Swarm UI and the shelved files are out of date.

Perforce Swarm cannot currently help with reconciling conflicts; you need to use a Perforce client such as P4 or P4V to reconcile conflicts.

Reconcile via P4

  1. Acquire a local copy of the files.

  2. Sync the files to the head revision: 

    $ p4 sync

  3. Begin resolving files with: 

    $ p4 resolve

    Choose an appropriate option to reconcile each file. For example: 

    $ p4 resolve
/home/bruno/bruno_ws/dev/main/jam/command.c - merging //depot/dev/main/jam/command.c#9
Diff chunks: 4 yours + 2 theirs + 1 both + 1 conflicting
Accept(a) Edit(e) Diff(d) Merge (m) Skip(s) Help(?) e:

  4. Re-shelve the resolved files with: 

    $ p4 shelve

    Note

    Ensure that the changelist description contains #review-12345 (separated from other text by whitespace, or on a separate line), where 12345 is the identifier of the review you are updating.

    Warning!

    If you use an invalid review identifier, it will appear that nothing happens. Swarm is currently unable to notify you of this situation.

Tip

For more information, see: P4 User's Guide: Resolve

Reconcile via P4V

  1. Acquire a local copy of the files.

  2. Context-click your workspace folder in P4V's Workspace tab. Select Resolve Files.... The Resolve dialog appears.

  3. Choose the appropriate options to reconcile each file.

  4. Context-click your workspace folder in P4V's Workspace tab. Select Shelve Files.... The Shelve dialog appears.

    Note

    Ensure that the changelist description contains #review-12345] (separated from other text with whitespace, or on a separate line), where 12345 is the identifier of the review you are updating.

    Warning!

    If you use an invalid review identifier, it will appear that nothing happens. Swarm is currently unable to notify you of this situation.

  5. Click Shelve.

Tip

For more information, see: P4V Online Help: Resolving Files