DEV Community

Discussion on: Solving git merge conflicts with VIM

Collapse
 
rohansawant profile image
Rohan Sawant

Solving git conflicts with vim for me is like playing fire when you have brought a knife to a gun fight.

I sometimes, just give up and reclone the entire repo like the sneaky noob that I am!

🤭