590
Commit (sh.itjust.works)
you are viewing a single comment's thread
view the rest of the comments
[-] goodthanks@lemmy.world 2 points 11 hours ago

Magit for Emacs is an excellent tool for resolving conflicts.

this post was submitted on 07 Feb 2025
590 points (100.0% liked)

Programmer Humor

33243 readers
861 users here now

Post funny things about programming here! (Or just rant about your favourite programming language.)

Rules:

founded 5 years ago
MODERATORS