Is your project stored on a cloud based storage, like OneDrive?
#Project Becomes Corrupt? Idk...
velvet hemlock
mighty tiger
Is your project stored on a cloud based storage, like OneDrive?
It is not. If I go to the file path there is no Onedrive folder there.
velvet hemlock
I'm not just asking for one drive
I'm asking for any possible cloud based storage
(Source control is excluded)
velvet hemlock
Renamed your project without using save as, or exporting it and importing it under a new name?
mighty tiger
No
velvet hemlock
Well, that crosses off the major ones at least
Does your .yyp have any deletions from your current commit/overall history that you are certain aren't caused by you?
mighty tiger
Does your .yyp have any deletions from your current commit/overall history that ...
No
velvet hemlock
Then hard to say if there's any project corruption at all then
mighty tiger
It may not even be a corrupt file but what's happening is really weird.
velvet hemlock
What version of GameMaker are you on btw?
mighty tiger
Current
velvet hemlock
Exact IDE/Runtime (you can left click on the version on the top right and it'll copy it to your clipboard)
mighty tiger
velvet hemlock
I guessing left click isn't enough?
That's also just IDE
fwiw, current could mean one of three:
- Monthly current
- Beta current
- LTS current
And the definition of "current" can vary between people and circumstances at times too, like when people forget to update to the latest version
mighty tiger
velvet hemlock
Okay cool
For the future, feel free to left click on it instead and just paste it in here... No need to prepare screenshots for it
Nonetheless, best to recover what you can and roll back via source control
And if anything happens again, you can give YYP maker a try https://sahaun.itch.io/yyp-maker
Otherwise I'd submit a bug report
mighty tiger
Nonetheless, best to recover what you can and roll back via source control
Source control is not letting me do that for some reason.
velvet hemlock
Try to narrow down what might be causing it
Do you perhaps have current changes in your source control that you haven't cleared?
mighty tiger
Do you perhaps have current changes in your source control that you haven't clea...
Yeah they're all cleared but it seems that Github desktop keeps adding text to my code and that's causing issues so it won't let me revert
velvet hemlock
I'd close your project first
Clear your changes
And then open it back up
GameMaker may be automatically doing things depending on what GameMaker is changing vs what you have committed previously
i.e. updating version numbers, adding in game options that weren't added in yet, etc
mighty tiger
This is all it shows
velvet hemlock
Merge?
Are you making commits instead of clearing them?
Also for the record
Github Desktop is telling you that you have merge conflicts in your project
Soo
That means someone else edited the same thing as you
Or two people may have added in an asset at the same time that caused a conflict (.yyp shennanigans.. fun)
mighty tiger
I am the only current editor in this repository
velvet hemlock
Are you making commits to the same branch, or merging commits from one branch to another?
mighty tiger
No
velvet hemlock
Well unless I can see what's going on
I can't really tell or help you much more directly here
Most I can suggest is taking your current commits (abort pushing)
And push them onto a new branch
mighty tiger
velvet hemlock
Showing me just error messages won't do enough
I need to see a whole lot more
There's a lot of details that are being withheld that is making hard for me to really say what's going on or how to fix it
velvet hemlock
Or two people may have added in an asset at the same time that caused a conflict...
Or there is someone else involved
The problem here is that you have another commit that happened to make the exact same changes
Around the same lines, on the same file
Git cannot merge these automatically
So it's asking you to resolve the merge conflict
You'll have to pull up a text editor and fix the offending lines
Either by merging them manually, or by erasing one of them
mighty tiger
You'll have to pull up a text editor and fix the offending lines
Can't I do this in Gamemaker itself?
velvet hemlock
In this case? They're just GML files so yes
But if this happens to a .yy file or worse, a .yyp file?
Then you can't use GameMaker to fix that
You'll have to use notepad++ or vscode or something else
velvet hemlock
Well I did say these were GML files
So you could use GameMaker directly to fix them
But good nonetheless 👌
mighty tiger
But then I still get this message#1193174372081483836 message
velvet hemlock
Well, again, there might be other changes that I can't see here
Might have to ask now that I'm rereading that error message, are you trying to do an actual commit revert?
mighty tiger
yes
velvet hemlock
I don't think you need to do that
mighty tiger
I don't think you need to do that
Then what do I need to do?
velvet hemlock
When I was meaning by rollback, I was meaning by just discarding your current changes (after backing up your changes)
mighty tiger
When I was meaning by rollback, I was meaning by just discarding your current ch...
Somehow I am not getting any of those options when I right click
And I cannot seem to select them all
velvet hemlock
In your current changed files, not your history, correct?
mighty tiger
oh I see
mighty tiger
In your current changed files, not your history, correct?
When I discard those changes they somehow come back and I have the same problem. It reverts the gml files and I have to edit them again.
velvet hemlock
Can you possibly cancel the revert commit you were trying to make in the first place?