pastermil@sh.itjust.works to Programmer Humor@lemmy.ml · 2 years agoCommitsh.itjust.worksexternal-linkmessage-square34linkfedilinkarrow-up11arrow-down10
arrow-up11arrow-down1external-linkCommitsh.itjust.workspastermil@sh.itjust.works to Programmer Humor@lemmy.ml · 2 years agomessage-square34linkfedilink
minus-squaregoodthanks@lemmy.worlddeleted by creatorlinkfedilinkarrow-up0·2 years agoMagit for Emacs is an excellent tool for resolving conflicts.
Magit for Emacs is an excellent tool for resolving conflicts.