3 ms·

Vs code + git graph + git lens is all you need for a happy git experience.

• solardev 3y ago
  How does diffing and conflict resolution work?
  • jcparkyn 3y ago
    [Not the person you're replying to] Vscode has a built-in (and quite good) 3-way merge editor, and an excellent editable diff view. GitLens also makes it easy to diff any two refs within vscode.
    • solardev 3y ago
      Thanks!
• LeBleu 3y ago
  This! Any graphical history for git that doesn't let you show all branches at once is trash. (Like the one in Visual Studio) The interactive rebase editor in Git Graph is very nice too. I also love how smoothly you can jump between git CLI and GUI in VS Code. I'll have to look at how to compare arbitrary commits in Git Lens and whether it is in the free version. That's the one thing I still rely upon TortoiseGit for