I was terrified of Git merge conflicts for 6 months

I used to literally create new folders and copy-paste code to avoid using branches. Then yesterday I had to fix a merge conflict at work because my boss told me I had no choice, and it only took me 7 minutes to figure out in VS Code. Has anyone else found a specific tool that made version control click for them?

2 comments

2 Comments

eva_thompson5d ago

Oh ABSOLUTELY. VS Code's merge editor saved my sanity after 2 years of avoidance.

ray1365d ago

Stick with the built-in one a bit longer, @eva_thompson - there is a small learning curve but once you get the hang of it, it really does make those messy conflicts a lot less painful.

-1