Handle conflicts resulting from a merge.
In some cases, the merge operation requires human intervention.
Merge automatically deals with everything that can be done safely.
Everything else is considered a conflict.
For
example, what if the file foo.js
was modified
in one branch and deleted in the other? This kind of situation requires
a person to make the decisions. The resolve operation is used to help the
user figure things out and to inform the VCS how the conflict should be
handled.