Bader Aljishi

[Feature] Smart merge

1

First off, thank you for this useful plugin. VScode has a pretty neat feature that allows a same line conflict to be resolved very quickly and efficiently. From here: https://code.visualstudio.com/docs/sourcecontrol/overview#_resolving-conflicts...