Helix Core is now P4. Product user interfaces will be updated soon. Learn more >>

P4 CLI Documentation | 2025.1

# Accepting yours, theirs, or merge

To accept a file without changing it, specify one of the following options:

Option | Description | Remarks
--- | --- | ---
`a` | Accept recommended file | If theirs is identical to base, accept yours. If yours is identical to base, accept theirs. If yours and theirs are different from base, and there are no conflicts between yours and theirs; accept merge. Otherwise, there are conflicts between yours and theirs, so skip this file.
`ae` | Accept edit | If you edited the merge file (by selecting `e` from the `p4 resolve` dialog), accept the edited version into the client workspace. The version in the client workspace is overwritten.
`am` | Accept merge | Accept merge into the client workspace as the resolved revision. The version in the client workspace is overwritten.
`at` | Accept theirs | Accept theirs into the client workspace as the resolved revision. The version in the client workspace is overwritten.
`ay` | Accept yours | Accept yours into the client workspace as the resolved revision, ignoring changes that might have been made in theirs.

Accepting yours, theirs, edit, or merge overwrites changes, and the generated merge file might not be precisely what you want to submit to the depot. The most precise way to ensure that you submit only the desired changes is to use a merge program or edit the merge file.

Your search for returned results