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 Server client such as p4 or P4V to resolve conflicts.
Sync the files to the head version:
$ p4 sync
Begin resolving files with:
$ p4 resolve
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:
Re-shelve the resolved files with:
$ p4 shelve
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.
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 "Resolve" in the Helix Versioning Engine User Guide.
In P4V, right-click your workspace folder and select Resolve Files.
The Resolve dialog appears.
Right-click your workspace folder and select Shelve Files.
The Shelve dialog appears.
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.
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 "Resolving Files" in the P4V User Guide.