DEV Community

Discussion on: How To Enable Real-Time Merge Conflict Detection in VS Code

darthwalsh profile image
Carl Walsh

I'm trying to understand, does this find conflicts with origin/main, all remote branches, your teammate's local commits, or your teammate's working tree? The latter two sound most useful but then it can't run completely local?

andrewgl profile image
Andrew Author

It finds conflicts with everything you mentioned, for the latter two it also requires them to have the extension installed