Sublime merge resolve conflict update#
Sublime merge resolve conflict professional#

While you could just drag the YYP onto the executable manually, a nicer way of doing so is to instruct git to do so automatically.įor this you want to extract the pre-commit file and place it in your. Obviously you can also use the two via command-line.įirst, you want to make sure that your YAML is always updated together with YYP.

Sublime merge resolve conflict update#

Drag such a YAML file onto the program's executable to update the YYP and view files to match its contents.Drag a YYP file onto the program's executable to generate a YAML version of it in the same directory.So each thing has its name/path, type, and both IDs all in the same line of YAML, which means that adding/removing resources/folders is a matter of changing a single line of code, and merge conflicts are less likely to occur to begin with.Ĭombine this with 'interactive' merge modes in git clients like Sublime Merge, and working with version control is suddenly a breeze. On other hand, this tool produces YAML files that are structured exactly like resource tree - so, if you had a folder called 'helpers' with scripts 'trace' and 'cycle', it might look like: Additionally, resolving merges is a mess because you cannot quickly look up which resources are used based on ID.

Sublime merge resolve conflict professional#

This is primary intended for resolving merge conflicts when using version control software, which is generally considered to be one of the program's weakest points by professional users.Īs you might be vaguely aware, GameMaker Studio 2 stores your project structure in a YYP file (which contains resource paths and resource IDs) and series of 'view' files (which correspond each each 'folder' that you can see in the resource tree).īoth of these are in JSON format, which is good for serialization purposes, but much less so for merging changes in version control - even adding a file to the end of the same resource tree folder on both branches is automatically a merge conflict due to lack of trailing comma as per JSON specification. In a sense, it is a successor to my older gmxorg tool.

YY-YAML (pronounced 'why, why - YAML') is an application that lets you convert between Game Maker Studio 2's project format (YYP + views directory) and single-file nested YAML.