Some merge conflicts are demanding, I like to jump to source files to get the complete picture, I can use familiar shortcuts if I can do it in VS Code.For diffing, I prefer viewing it in a GUI-based editor.I would prefer to switch to another tab of my code editor rather than a separate window. I prefer less switching between applications generally.I haven’t used some of the Linux command-line tools associated with Git such as Nano enough to get the necessary muscle memory, I forget the commands! 🙈 It can be a flow-buster.If I am executing an interactive git command that requires input from me to edit and review a chunk of text, I would prefer to stay in my code editor and stay in the same mental mode.Here are the situations where I have encountered friction or have an alternate preference: In a sentence, I prefer to do as much as I can in my code editor. I’ll explain my decision and maybe it will give your some insight in to understanding what works best for you. Above all else, your tools should complement your workflow and not impede you.

It’s a personal choice! There are many, many options out there. Why should you make VS Code your default Git Editor, Diff Tool, or Merge Tool? If you want to see how an edit, diff, or merge looks in VS Code, go to the corresponding section to see screenshots.

Visual studio code git client