pastermil@sh.itjust.works to Programmer Humor@lemmy.ml · 5 months agoCommitsh.itjust.worksimagemessage-square34fedilinkarrow-up11arrow-down10
arrow-up11arrow-down1imageCommitsh.itjust.workspastermil@sh.itjust.works to Programmer Humor@lemmy.ml · 5 months agomessage-square34fedilink
minus-squaregoodthanks@lemmy.worldlinkfedilinkarrow-up0·5 months agoMagit for Emacs is an excellent tool for resolving conflicts.
Magit for Emacs is an excellent tool for resolving conflicts.