I kept running into the same problem working on shared branches: you think everything is fine, then a pull/merge blows up with conflicts and you lose time untangling it. So I built a VS Code extension that tries to surface merge conflicts before you actually merge. It uses Git’s merge-tree under the hood to simulate merges locally and then shows: which files are likely to conflict inline highlights inside the editor a small dashboard to inspect potential issues The goal isn’t to replace Git tooling, just to make conflicts less “surprising” and more visible earlier in the workflow. I’m still figuring out: how accurate/useful this is in larger repos whether the UI is actually helpful or just noise what workflows this fits best (PRs, long-lived branches, etc.) Would really appreciate feedback—especially if you deal with frequent merge conflicts. Link: https://marketplace.visualstudio.com/items?itemName=SukantaS...