this post was submitted on 20 Nov 2024
878 points (97.6% liked)

Programmer Humor

19735 readers
207 users here now

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

founded 1 year ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
[–] AdamBomb@lemmy.sdf.org 1 points 1 week ago

Vim is actually great for resolving merge conflicts, but I’ll grant it’s not for everyone. There are several different views available and dedicated navigation and resolution commands. For just viewing diffs, I use Delta for general purpose work but also reach for Difftastic to help understand big hairy diffs.

For all that, I’m not above using JetBrains Git UI for a quick commit and push if I’m already in the IDE anyway. Depends on where I am when I need to do the thing.