pastermil@sh.itjust.works to Programmer Humor@lemmy.ml · 2 months agoCommitsh.itjust.worksexternal-linkmessage-square23fedilinkarrow-up1578arrow-down12
arrow-up1576arrow-down1external-linkCommitsh.itjust.workspastermil@sh.itjust.works to Programmer Humor@lemmy.ml · 2 months agomessage-square23fedilink
minus-squaregoodthanks@lemmy.worldlinkfedilinkarrow-up2·2 months agoMagit for Emacs is an excellent tool for resolving conflicts.
Magit for Emacs is an excellent tool for resolving conflicts.