pastermil@sh.itjust.works to Programmer Humor@lemmy.ml · 4 months agoCommitsh.itjust.worksexternal-linkmessage-square34linkfedilinkarrow-up1767arrow-down16 cross-posted to: [email protected]
arrow-up1761arrow-down1external-linkCommitsh.itjust.workspastermil@sh.itjust.works to Programmer Humor@lemmy.ml · 4 months agomessage-square34linkfedilink cross-posted to: [email protected]
minus-squaregoodthanks@lemmy.worldlinkfedilinkarrow-up2·4 months agoMagit for Emacs is an excellent tool for resolving conflicts.
Magit for Emacs is an excellent tool for resolving conflicts.