pastermil@sh.itjust.works to Programmer Humor@lemmy.ml · 15 hours agoCommitsh.itjust.worksimagemessage-square25fedilinkarrow-up1539arrow-down16 cross-posted to: [email protected]
arrow-up1533arrow-down1imageCommitsh.itjust.workspastermil@sh.itjust.works to Programmer Humor@lemmy.ml · 15 hours agomessage-square25fedilink cross-posted to: [email protected]
minus-squaregoodthanks@lemmy.worldlinkfedilinkarrow-up2·8 hours agoMagit for Emacs is an excellent tool for resolving conflicts.
Magit for Emacs is an excellent tool for resolving conflicts.