Git on Visual Studio is so dumb

I wanted to do a Pull Request, and when I checked the request, a conflict prevented from auto-merging and ask to resolve it in Visual Studio.

"What conflitct ?" I asked.

"You're on your own, fam" Visual Studio answered.

Real sweet.

I only use the CLI for git, but I do use VStudios built in mergetool as it’s pretty dang good.

If you google for it, there’s a way to get git to use vstudio for conflicts from the console.

Then you can just do “git mergetool” from the console and use the visual editor to fix it 👍

@Brolls thing is

I HAVE to use the VS tool. Not a command line. Because the proxy block the dL links to Any bash. That’s pretty dumb

@DodgerAkame :(