Git: Copilot powered conflict resolutions

[joaomoreno]

We have some affordances that highlight merge conflicts on both experiences (codelens and merge editor). It would be interesting to surface UX that would allow the user to delegate resolving the merge conflicts to Copilot.