O'Reilly logo

Learning Perforce SCM by Robert Cowham, Neal Ralph Firth

Stay ahead with the world's most comprehensive technology and business learning platform.

With Safari, you learn the way you learn best. Get unlimited access to videos, live online training, learning paths, books, tutorials, and more.

Start Free Trial

No credit card required

Avoiding conflicts

While we encourage you to allow Perforce to manage conflicts, there are times when it is best to avoid them. In particular, this can be true when your changes have priority over other peoples' or when a file cannot easily be merged. We'll cover both of these scenarios in this section.

Priority modifications – locking files

Sometimes you need to take priority when modifying a file. In Perforce, this equates to guaranteeing that you are the next person to submit a file. The mechanism is called locking a file. Note that needing priority is common after a failed submit, so P4V automatically locks all of the files in a failed submit.

Although it is not a best practice, you can always explicitly lock any file you have checked out. The ...

With Safari, you learn the way you learn best. Get unlimited access to videos, live online training, learning paths, books, interactive tutorials, and more.

Start Free Trial

No credit card required