Magic Merge errors with Automation Helpers.

Ask general questions here.
Post Reply
dmconsulting1
Posts: 83
Joined: Fri Nov 08, 2019 3:23 pm

Magic Merge errors with Automation Helpers.

Post by dmconsulting1 » Tue Jun 02, 2020 3:35 pm

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

Any ideas? It doesn't give me any info.
Attachments
mergeError.png
mergeError.png (15.76 KiB) Viewed 56 times
Top
User avatar
Vega
Certified Professional
Certified Professional
Posts: 214
Joined: Mon Jul 11, 2016 2:15 pm

Re: Magic Merge errors with Automation Helpers.

Post by Vega » Tue Jun 02, 2020 8:37 pm

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:
formgit.png
formgit.png (74.28 KiB) Viewed 46 times
hope this helps
Top
Post Reply

Return to “General Questions”