Fix errors that cannot be merged 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.

Helix Swarm cannot currently help with resolving conflicts; you need to use a Helix Core Server client such as p4 or P4V to resolve conflicts.

Resolve via P4

1. Acquire a local copy of the files.

2. Sync the files to the head version:

   $ p4 sync

3. Begin resolving files with:

   $ p4 resolve

4. Choose an appropriate option to resolve 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:

5. 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. If the review has not been correctly updated, use the Add Change button in the Swarm review heading to add the changelist to the review, see Add a changelist to a review.

For more information, see p4 resolve in the Helix Core Command-Line (P4) Guide.

Resolve via P4V

1. Acquire a local copy of the files.

2. In P4V, right-click your workspace folder and select Resolve Files.

   The Resolve dialog appears.

3. Choose the appropriate options to resolve each file.

4. Right-click your workspace folder and 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. If the review has not been correctly updated, use the Add Change button in the Swarm review heading to add the changelist to the review, see Add a changelist to a review.

5. Click Shelve.

For more information, see "Resolving Files" in the Helix Core Visual Client (P4V) Guide.