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

Magit for Emacs is an excellent tool for resolving conflicts.

this post was submitted on 07 Feb 2025
757 points (99.0% liked)

Programmer Humor

35305 readers
243 users here now

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

Rules:

founded 5 years ago
MODERATORS