minus-squareAtaraxicMegatron@social.fossware.spacetoProgrammer Humor@lemmy.ml•always try and get my PR merged before anyone elselinkfedilinkEnglisharrow-up4·1 year agoGit porcelain like magit make dealing with conflicts a lot more bearable. linkfedilink
minus-squareAtaraxicMegatron@social.fossware.spacetolinuxmemes@lemmy.world•Librewolf is Firefox but betterlinkfedilinkarrow-up4·1 year agohttps://f-droid.org/packages/org.mozilla.fennec_fdroid/ linkfedilink
Git porcelain like magit make dealing with conflicts a lot more bearable.