Ranorex Forum

Lately I seem to be getting this error a lot while trying to merge master.

Any ideas? It doesn't give me any info.

I am not sure about that specific error, but try opening the csproj file in an editor which can show you the merge conflict so you can visually see the difference/conflict. I would personally recommend VS code but there any many editors that can do this:
hope this helps