As much as one may attempt to avoid conflicts, it is also necessary to solve them when they happen. This concern is the object of the present chapter.
Merging has become a pet peeve for many, to the point of being overused, and for purposes other than conflict resolution.
We'll review both practical aspects, and will guide about things to do and things to avoid.
Faithful to our focus, we shall ignore any UCM aspects and the graphical tools, with their additional and accidental complexities.
Somehow, this chapter might naturally feel of lesser importance than the preceding ones. This is of course by choice: we focused first on the essential, pushing forward the remaining explanations. Sharing our vision of the essential is part of ...