What resolution strategy does Copado apply to branches during a conflict?

In Copado, when a conflict arises between branches during the merging or deployment process, the resolution strategy is designed to prioritize one branch over the other. This means that if there is a conflict, the contents of one branch will override those from another branch, effectively designating that branch as the authoritative source for the conflicting changes.

The strategy of having one branch "win" over another is particularly useful in ensuring a clear and manageable approach to conflict resolution. It allows teams to maintain consistency in their code base and reduces the complexity that can arise from merging multiple changes across branches without a clear resolution strategy.

While branches can be merged together in other scenarios or systems, the focus here is on a decisive resolution where one branch's changes are adopted completely in the event of a conflict. This makes it simpler for teams to track changes and avoid potential issues that could arise from more complicated merge scenarios where both branches might retain conflicting changes.