pastermil@sh.itjust.works to Programmer Humor@lemmy.ml · 10 hours agoCommitsh.itjust.worksimagemessage-square25fedilinkarrow-up1477arrow-down15 cross-posted to: programmer_humor
arrow-up1472arrow-down1imageCommitsh.itjust.workspastermil@sh.itjust.works to Programmer Humor@lemmy.ml · 10 hours agomessage-square25fedilink cross-posted to: programmer_humor
minus-squaregoodthanks@lemmy.worldlinkfedilinkarrow-up2·4 hours agoMagit for Emacs is an excellent tool for resolving conflicts.
Magit for Emacs is an excellent tool for resolving conflicts.