I built a VS Code extension to avoid messy Git merges (MergeGuard)

Max — Wed, 15 Apr 2026 06:49:03 +0000

If you’ve worked with Git long enough, you’ve probably had that moment.

You pull the latest changes, try to merge, and suddenly your editor is full of conflict markers. Files you didn’t even touch are now broken, and you’re left figuring out what went wrong.

I’ve been there more times than I’d like to admit.

The problem

Most merge conflicts don’t actually come out of nowhere.
They happen because multiple people are working on the same parts of the codebase—but we usually don’t realize it until it’s too late.

By the time Git tells you there’s a conflict, you’re already in damage control mode.

The idea

I started wondering:

What if I could know before merging that something is likely to break?

That’s what led me to build MergeGuard — a small extension for Visual Studio Code that tries to surface potential merge risks earlier in your workflow.

What MergeGuard does

The goal isn’t to replace Git or do anything magical.
It simply gives you a heads-up when something looks risky.

Some things it focuses on:

Highlighting areas that are likely to cause conflicts
Helping you notice overlapping changes early
Encouraging cleaner, more predictable merges

It’s meant to be lightweight and stay out of your way.

Why I built it

Honestly, this came from frustration.

I didn’t want to:

Waste time resolving avoidable conflicts
Break working code during merges
Or feel uncertain every time I pulled changes

This was my attempt to make that experience a bit smoother.

Try it out

If this sounds useful, you can check it out here:
https://marketplace.visualstudio.com/items?itemName=SukantaSaha.mergeguard

I’d love your feedback

This is still early, and I’m sure there’s a lot of room to improve.

If you try it:

Let me know what feels useful
What’s annoying
Or what you wish it did instead

Even small suggestions would help shape where this goes next 🙌

Thanks for reading!