Merge files

If you and another user have edited the same file, P4V requires you to resolve those changes. One way of resolving is by merging your changes with the other changes using P4Merge. P4Merge enables you to compare two text files with a common base file to locate differences and to select the text that you want in the merged result file. The purple icon () is associated with the file that another user edited (their file), and purple bands highlight text that is unique to that file. The green icon () is associated with file that you edited (your file), and green bands highlight text that is in the second file but not the first file. The base file is indicated by the yellow icon (), and yellow highlighting indicates text that is in the base file but not in the other files.

In the top half of the window, P4Merge displays the base file surrounded by the two changed versions of the revision being merged. In the bottom half of the window, P4Merge displays the merge results file, where you select or enter the text that you want to submit. Make your changes as described below, and be sure to save them before exiting P4Merge.

For more information on resolving changes, including opening P4Merge, see Resolve files.

For more information on merging changes in P4Merge, see Navigate diffs and Merge text in the P4Merge User Guide.