10 ms·
+1 for gitlens. I often use jetbrains for development work but fire up vs code with gitlens for tricky merge conflicts or a deep dive with blame.
by bebop 5y ago
+1 for gitlens. I often use jetbrains for development work but fire up vs code with gitlens for tricky merge conflicts or a deep dive with blame.
- d3nj4l 5y agoI've found JetBrains IDEs have pretty good Git tooling, and can show you history for selection and viewing complex commit histories. What do you use in GitLens that you find better than IDEA? I'm curious if it is worth making the jump.
- mohanmcgeek 5y agoI'm not sure why but a lot of people using idea to write the actual code then switch to vscode to resolve a merge conflict or some other git mess that needs cleaning.. I think it's more about comfort levels. So if you're already comfortable doing this in IDEA, you don't stand to gain anything. Also, for Jvm languages, idea is still a better choice than vscode
- pkaye 5y agoHow does gitlens help with merge conflicts?