pastermil@sh.itjust.works to Programmer Humor@lemmy.ml · 15 days agoCommitsh.itjust.worksimagemessage-square35fedilinkarrow-up1752arrow-down18 cross-posted to: programmer_humor@programming.dev
arrow-up1744arrow-down1imageCommitsh.itjust.workspastermil@sh.itjust.works to Programmer Humor@lemmy.ml · 15 days agomessage-square35fedilink cross-posted to: programmer_humor@programming.dev
minus-squaregoodthanks@lemmy.worldlinkfedilinkarrow-up2·15 days agoMagit for Emacs is an excellent tool for resolving conflicts.
Magit for Emacs is an excellent tool for resolving conflicts.