3 ms·Most my merge conflicts happen to be xml based files e.g csprojby amriksohata 9y agoMost my merge conflicts happen to be xml based files e.g csproj