You know that manual merges are a real pain? Well, I’ve just released a Visual Studio extension that makes manual merges a thing of the past.

No source control system can automatically merge two edits to the same line of code. Conflict Alert solves this by warning you that you are heading down a path that will cause a manual merge later down the line. You choose whether you want to carry on, or talk to your teammate and find out what they are doing.

Have you ever warned your teammates that you are doing a big refactor, and that they should ‘keep out of class X’? Conflict Alert tells them for you automatically by highlighting the sections of code that you have edited.

It doesn’t need to connect to your source control system, so it works no matter which you use.

Its a first release, and I hope it is useful. Any feedback would be gratefully received.

Grab a teammate and try it now.