pastermil@sh.itjust.works to Programmer Humor@lemmy.ml · 5 months agoCommitsh.itjust.worksimagemessage-square32fedilinkarrow-up1767 cross-posted to: [email protected]
arrow-up1767imageCommitsh.itjust.workspastermil@sh.itjust.works to Programmer Humor@lemmy.ml · 5 months agomessage-square32fedilink cross-posted to: [email protected]
minus-squaregoodthanks@lemmy.worldlinkfedilinkarrow-up2·5 months agoMagit for Emacs is an excellent tool for resolving conflicts.
Magit for Emacs is an excellent tool for resolving conflicts.