Found a way to squash merge conflicts in VS Code that actually works for me

I kept messing up merge conflicts and getting so frustrated. Then someone showed me the 'Accept Combination' button inside the VS Code merge editor and I saved like 20 minutes on a project last Tuesday. Anyone else got a merge trick that made everything click?

2 comments

2 Comments

the_dylan26d ago

Wait, is 20 minutes really that big of a deal? I mean merge conflicts can be annoying but if you're spending that long on them regularly maybe the issue is something else lol. The accept combination button is neat and all but I feel like people make merge conflicts sound way worse than they actually are. Usually its just picking the right parts and moving on, barely takes more than a few minutes if you actually understand what you merged. But hey if it works for you then cool, I guess I just don't see why some people act like its this huge nightmare.

the_jason26d ago

Yeah but @the_dylan, when you're dealing with a codebase that's got like six people all touching the same files, "a few minutes" turns into "oh great here comes the spaghetti" real quick. I've seen 20 minute fixes turn into an hour chase where you're just trying to figure out who broke what in the first place. It's not the merge itself, it's the domino effect.