Solving git merge conflicts with VIM
A flow so smooth you’d be wishing for conflicts to happen Photo by pexels.com [I use VIM] (https://dev.to/omerxx/vim-from-foe-to-friend-in-9-minutes-2np0). These lines are written in VIM, and so does every single line of code I write. Git has become an integrated tool of almost everyone in tech...