Merge Conflict Guide A guide written for handling merge conflicts in game jams, especially for use with games made with Game Maker: Studio. Scenario: There is a merge conflict You can see this either from Github (when you try to merge a PR and it fails), or from your git client (when you try to rebase / merge to the main branch). When you enter a merge conflict, you’ll enter a merging state.…