pastermil@sh.itjust.works to Programmer Humor@lemmy.ml · 15 days agoCommitsh.itjust.worksexternal-linkmessage-square34fedilinkarrow-up10arrow-down10 cross-posted to: [email protected]
arrow-up10arrow-down1external-linkCommitsh.itjust.workspastermil@sh.itjust.works to Programmer Humor@lemmy.ml · 15 days agomessage-square34fedilink cross-posted to: [email protected]
minus-squaregoodthanks@lemmy.worldlinkfedilinkarrow-up0·14 days agoMagit for Emacs is an excellent tool for resolving conflicts.
Magit for Emacs is an excellent tool for resolving conflicts.