this post was submitted on 20 Jun 2023
44 points (100.0% liked)
Programming
13376 readers
1 users here now
All things programming and coding related. Subcommunity of Technology.
This community's icon was made by Aaron Schneider, under the CC-BY-NC-SA 4.0 license.
founded 1 year ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
I use a mix of CLI, the Git UI built into VSCode, and Sublime Merge.
Sublime Merge is great for getting an overview, it's very snappy (especially when compared to Electron Git UIs), and I love the merge conflict editor. It's not cheap, but worth every penny.
Isn't it free if you're okay with using it in light mode?