3 ms·Sublime Merge by the same folks is also fantastic. My favorite visual fit clientby jacobkg 5y agoSublime Merge by the same folks is also fantastic. My favorite visual fit clientO_H_E 5y ago*gitpeteretep 5y agoMy workflow at the moment is VS Code for TS/JS but Sublime Merge for when I need to interact with git, ignoring the built-in VS Code stuff.