pastermil@sh.itjust.works to Programmer Humor@lemmy.ml · 3 months agoCommitsh.itjust.worksimagemessage-square34linkfedilinkarrow-up1757arrow-down17 cross-posted to: [email protected]
arrow-up1750arrow-down1imageCommitsh.itjust.workspastermil@sh.itjust.works to Programmer Humor@lemmy.ml · 3 months agomessage-square34linkfedilink cross-posted to: [email protected]
minus-squaregoodthanks@lemmy.worldlinkfedilinkarrow-up2·3 months agoMagit for Emacs is an excellent tool for resolving conflicts.
Magit for Emacs is an excellent tool for resolving conflicts.