- Resolving conflicts: Conflicts may crop up when merging branches with conflicting modifications. They should be solved by picking out which improvements to keep and which modifications to discard. Here are several capabilities and competencies that one need to seek out whilst cho