Using Git with Gamemaker Studio (One)

Note that as far as I'm aware it is not possible to buy Gamemaker Studio One, or Gamemaker HTML.

This is a shame as they served a purpose and in my opinion there is a legitimate need for a tool to produce HTML5 games without having to "dirty your hands" with browser peculiarities. While it is hard to make a profit from "free" I think there's a legitimate case for releasing a single target version as a "billboard" for the main multi-target product, especially as Unity appears to be where its at nowadays.

Enough said.

Git integration is done by calling the command line Git using a number of predefined commands. The output is redirected into a file "SCIfile.txt" and sadly this is created in the game folder. Other than this GM Studio maintains a very clean project file free of build files to the point it is possible to work without a ".gitignore" file. I would recommend a one-line file ignoring "SCIfile.txt" to keep it out of your commits.

GM Studio encourages micro-committing individual files, so it may be worth learning how to squash trivial commits as you go along. As squashing is a form of rebasing it is also worth adopting a branched workflow where you create a branch before doing anything, then work on the branch, clean it up as needed and then pull it into main (or master) before pushing the clean version to the remote repository. This avoids the need to use "force" when pushing "main".

Source control configuration

File to download: downloads/gms_git.scmconfig.xml

This is configured in the IDE preferences menu, and I believe it is shared by all projects.

This file may differ from the default configuration GM Studio offers. The IDE was probably set up to use Subversion and Git commands aren't a perfect fit to the IDE options.