p4_resolve
Resolve merge conflicts in Perforce by accepting theirs, yours, merging edits, or skipping, for specific files or all pending conflicts.
Instructions
Resolve merge conflicts
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| files | No | Files to resolve (optional, resolves all if not specified) | |
| strategy | No | Resolution strategy (optional) | |
| changelist | No | Changelist number (optional) | |
| workspacePath | No | Path to workspace directory (optional, defaults to current directory) |