Step-by-step explanation:
In order to reconcile divergent branches, you need to specify the resolution strategy. This means deciding which branch has the correct version of the code, and then merging the necessary changes from the other branch. Depending on the situation, this could involve manual intervention, or automated merging tools. Once the resolution strategy is determined, it is important to communicate it to all stakeholders.