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

Automatic resolve

We deferred talking about the automatic resolve options in Chapter 7, Dealing with Conflicts because it really comes in to its own when propagating changes between branches.

It is not uncommon to change a large number of files on a branch. If we had to manually resolve conflicts, file-by-file, in order to propagate changes between branches, the overhead would quickly consume most of a developer's time. Yet we know that most of the time there will be no content conflicts that require human intervention. This is where the automatic resolve actions come into play. They provide the power of automation, and with the safety and control of human supervision. What does this look like?

On our pending changelist (not an individual file) ...

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