Re-merging and re-resolving files

After a revision of a source file has been merged into a target, that revision is skipped in subsequent merges to the same target. To force the merging of already-merged files, specify the -f option when you issue the p4 merge command.

A target that has been resolved but not submitted can be resolved again by specifying the -f option to p4 resolve. When you re-resolve a file, yours is the new client file, the result of the original resolve.