this post was submitted on 20 Jun 2023
76 points (100.0% liked)
Programming
13381 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
This one. It's sophisticated and easy to navigate.
I generally do conflict resolution in Jetbrains IDEs and everything else in CLI. Occasionally, I might commit from the IDE if I only want a single file.