Lately I seem to be getting this error a lot while trying to merge master.
Any ideas? It doesn't give me any info.
Magic Merge errors with Automation Helpers.
-
- Posts: 102
- Joined: Fri Nov 08, 2019 3:23 pm
Magic Merge errors with Automation Helpers.
- Attachments
-
- mergeError.png (15.76 KiB) Viewed 182 times
Re: Magic Merge errors with Automation Helpers.
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
hope this helps