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

Summary

Conflicts are a natural consequence of concurrent development. In this chapter, we've seen that dealing with conflicts only looks complex. In most cases, the identification and resolution of conflicts is actually rather straightforward. Most users only need to apply a small set of the available Perforce features for most of their conflict resolution needs. However, when more advanced techniques are required, those are available too. Perhaps most importantly, Perforce does not allow accidents. The server ensures that users acknowledge and resolve conflicts before it allows updates to the repository.

In the next chapter, we'll look at classic branch and merge operations, and we will see how merging between branches builds on the conflict ...

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