Like many I have moved on from Sublime Text to VSCode but as someone who cannot live without a Git Client UI, Sublime Merge continues to be my favorite. It has the same Sublime Text ethos around speed and is generally a joy to use