merge: "resolved" hyperlink is confusing
When I'm doing a merge that has conflicts it is not at all logical for me to click a link saying "resolved" in order to attempt to resolve my conflicts.
"Please resolve merge conflicts before continuing." where "resolve merge conflicts" is a link would make way more sense.
Even better would be to make resolving conflicts a screen within the wizard.