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