on always try and get my PR merged before anyone else · c/programmerhumor · 4 pts · 3yJetbrains IDE is pretty good at solving conflicts.
Same. At least I know it detected me.
Jetbrains IDE is pretty good at solving conflicts.