Can't solve conflicts with Unity running?

When I try to resolve a conflict from the Unity editor I get this message:

View attachment 1038257

This is obviously something we have to be able to do from Unity, it takes me 15 min to start up my project I cant do that every time I need to solve a conflict.

Is this a known issue?