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

P4 CLI Documentation | 2025.1

# Editing the merge file

To resolve files by editing the merge file, choose the `e` option. P4 Server launches your default text editor, displaying the merge file. In the merge file, diffs and conflicts appear in the following format:

    >>>> ORIGINAL file#n(text from the original version)
    ==== THEIR file#m(text from their file)
    ==== YOURS file(text from your file)
    <<<<

To locate conflicts and differences, look for the difference marker `>>>>` and edit that portion of the text. Examine the changes made to theirs to make sure that they are compatible with your changes. Make sure you remove all conflict markers before saving. After you make the desired changes, save the file. At the `p4 resolve` prompt, choose `ae`.

By default, only the conflicts between the yours and theirs files are marked. To generate difference markers for all differences, specify the `-v` option when you issue the `p4 resolve` command.

Your search for returned results