-
Notifications
You must be signed in to change notification settings - Fork 8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Start new projects with a seed .gitignore and .gitattributes file #2922
Comments
I'd like to add a +1 to this. I just wasted half an hour researching whether I can safely add .resource_order to the gitignore before I found this thread, seems like it should be default (anyone who has used GameMaker with Git runs into these messy merge issues) |
A preference has been added into Plugin -> Source Control (Git) -> Add skeleton .git defaults which, when checked, will automatically add default .gitignore and .gitattributes files as described in the issue here (as well as in #4820) into the project folder when the project is created. |
Reopening as the Mac IDE does not generate the files on new projects. Windows and Ubuntu look fine. |
This seems to be more due to mac very thoroughly hiding files beginning with a dot, these can be shown by doing cmd+shift+dot but the files do seem to actually be there on mac as well. |
Verified done as per comment. Thanks! |
Moving this ticket back to "Done" since documentation still needs to be added. |
…ibutes file YoYoGames/GameMaker-Bugs#2922 YoYoGames/GameMaker-Bugs#4559 * Updated the screenshot on the "Plugin Preferences" page and listed the new preferences * Added info on the default .gitignore and .gitattributes files and LF endings on the "Project Format" page, added links to prefs where appropriate
The contents of the default |
verified as of IDE v2024.400.0.550 Runtime v2024.400.0.567 |
Is your feature request related to a problem?
Following the 2023.1 update,
.resource_order
and.old
files began appearing in projects, which should not be checked into source control by default. If someone sets up Git but isn't aware of this change (especially if they are using a source control tutorial), they may accidentally add these files to their repository, resulting in constant "file modified" issues and merge conflicts from regular use.Also, historically GM projects on GitHub had been mistakenly identified as about 20%+ YACC because of the
.yy
files (example). That false detection can be turned off by adding a.gitattributes
file, but there has been little community awareness of the issue.GM projects should be source-control-friendly by default, but these issues get in the way of that.
Describe the solution you'd like
I would like new projects to be created with a default
.gitignore
and.gitattributes
file that covers current use cases..gitignore
:.gitattributes
:Describe alternatives you've considered
I have been gradually adding these to my existing projects as I migrate them to the 2023 format, but going forward, I would like to see new projects start with them.
Additional context
No response
The text was updated successfully, but these errors were encountered: