this post was submitted on 20 Jun 2023
41 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 2 years ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
Sublime Merge has been wonderful to work with
It is one of the few tools that doesn't misrepresent the core git paradigm.
Definitely can recommend Sublime Merge as well!
I also love how fast Sublime Merge is. The built in merge tool is great too. I'm a sucker for apps with a command palette for easy access to every command.
+1 for Sublime merge. I use it to resolve conflicts because I appreciate a gui for that and cli for everything else.