this post was submitted on 20 Nov 2024

906 points (97.6% liked)

Programmer Humor

19699 readers

103 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

Keep content in english
No advertisements
Posts must be related to programming or programmer topics

founded 1 year ago

MODERATORS

906

Microsoft Please Fix (lemmy.zip)

submitted 3 days ago* (last edited 3 days ago) by [email protected] to c/programmer_humor

365 comments fedilink hide all child comments

The real report

Bonus

you are viewing a single comment's thread
view the rest of the comments

[–] [email protected] 1 points 2 days 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.