Your, theirs, base, and merge files

The p4 resolve command uses the following terms during the merge process:

File revision	Description
yours	The revision of the file in your client workspace, containing changes you made.
theirs	The revision in the depot, edited by another user, that `yours` conflicts with. (Usually the head revision, but you can schedule a resolve with another revision using `p4 sync`.)
base	The file revision in the depot that yours and theirs were edited from (the closest common ancestor file).
merge	The file generated by Helix Core Server from theirs, yours, and base.
result	The final file resulting from the resolve process.