Dealing with Git Merge Conflicts in Game Maker Studio 2
I've already had to deal with 3 or 4 merge conflicts on day two of Git with my students, so I thought I would post a video showing how I ended up with a merge conflict and how I resolved it.
You will want to download Atom.io - the hackable text editor, and you will want to install the diff-split package for Atom as a way of dealing with the files with a conflict.
The video shows how I do it.