Game won't load after using GitHub. Maybe more of a git rather than AGS question

[newwaveburritos]

I'm not sure exactly what I did but I was working last night to fix some stuff and I got a little over my head and decided to revert back to a previous commit so I could start over.  I'm not exactly sure what I did wrong and while I have been making commits fairly regulary I don't actually revert very often.  Somehow I managed to screw everything up and I had a few conflicted files in the merge and now when I try to load the game I get this error.  I can go back to a previous previous commit so all is not lost but it doesn't really add up there either because the name of the commit explaining what I did isn't even present in it so I'm at a bit of a loss.  I think I've gotten over the panicking but it would be great to be able to claw back some of this work.

[Crimson Wizard]

There's not much to tell or do about the game project itself, it's clear that the file got corrupted, the error message indicates where, but it's impossible to say anything without seeing the contents of the file itself.

The game file is Game.agf, which is an XML, so may be opened with any text editor and read.

But since you are using a git, maybe it's easier to track commit changes to see where it went wrong.

[newwaveburritos]

I can link you to the GitHub but I don't know how useful that's going to be. I feel like I should just take this as a could-be-worse lesson in gamedev. It seems like a big ask to have someone else pore through it.

[Crimson Wizard]

You said you had a merge which resulted in this problem, maybe you could reset the branch one step back, deleting the merge commit, and try again?

[newwaveburritos]

I'm not really sure why I was merging to begin with.  I don't know why I would do that.  I guess I should watch some videos on how to use GitHub without ruining your projects!