When you have divergent branches and need to specify how to reconcile them, you should:
A) Conduct a vote to determine the preferred branch
B) Use a merge tool to combine the changes
C) Create separate branches for each divergent idea
D) Consult a supervisor for resolution