minus-squareBor@reddthat.comtoProgrammer Humor@lemmy.ml•always try and get my PR merged before anyone elselinkfedilinkEnglisharrow-up5·1 year agoJetbrains IDE is pretty good at solving conflicts. linkfedilink
Jetbrains IDE is pretty good at solving conflicts.