A flow so smooth you’d be wishing for conflicts to happen
Photo by pexels.com
I use VIM.
These lines are written in VIM, and so does ev...
For further actions, you may consider blocking this person and/or reporting abuse
I'd used fugitive for awhile but found the diff too cluttered. I switched to diffconflicts. It is not the only information needed to handle a merge, but it is often context on many files needed.
github.com/whiteinge/diffconflicts
Handling Merges
Jesse Phillips ・ Jun 22 ・ 3 min read
Great article! I think I might adopt something like these into my vimrc as well!
Nice! Let me know how it works!
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!
🤭
how to know the name of \2 or \3?