Chapter 7. Dealing with Conflicts
To Perforce, conflict does not indicate a problem. Rather, it refers to the need for a human to resolve issues that may arise from independent modifications of the same repository file. If there is more than one user, branch, or workspace there are conflict scenarios.
As we will see, conflict scenarios are a natural consequence of the flow of development. In this chapter, we'll review the origins of Perforce conflicts, predicting future conflicts, identifying current conflicts, resolving conflicts, and ways to avoid them.
In this chapter we will cover:
- File conflicts
- Content conflicts
- Interactive resolution
- Automatic resolution
- Avoiding conflicts
The origin of a conflict
Conflicts arise from concurrent changes to the ...