Hacker News new | ask | show | jobs
by arcticbull 1552 days ago
Am I the only person who opens the whole conflicted project in VSCode and project-wide searches for ">>>>>>"
4 comments

This is often the only reason for me to open vscode on a project. I hate everything about their git flows, except the merge UI
I do the same. >> usually does the trick
You're not alone.
I stand with you.
There are dozens of us! DOZENS!