| Perforce API for the .Net CLR |  |
| Perforce API for the .Net CLR | |
Actions to take when resolving a file.
| Member Name | Description |
|---|---|
| Quit | Quit the resolve workflow. |
| Skip | Skip this file in the resolve workflow. |
| AcceptMerged | Accept the merged file from Perforce. This file must not be edited. |
| AcceptEdit | Accept the result file with your edits. The result file should be edited before returning this merge action. |
| AcceptTheirs | Accept 'their' file ('your' changes will be lost). |
| AcceptYours | Accept 'your' file ('thier' changes will be lost). |
Namespace: P4API
Assembly: p4api (in p4api.dll)