Studio Merge Checklist

Merge Checklist

This is a general guide that I hope everyone in the studio follows to ensure that main (and the features you've been working on) doesn't break.

Later into the semester, if main is repeatedly broken, I will look to implementing a proper checklist system.

Steps

0. (Expected) Run the build command and test that the game is working
1. Merge the Main branch into your current branch
2. Fix all Merge Conflicts
3. Run the build command again
4. Look through the feature list (below) and make sure that each feature is still working after the merge
5. Create a Pull Request and provide a brief description of your additions and what features should be seen in game
6. Ask members in other teams to approve your Pull Request (you'll need at least 1 approval)

Features to Look for

Once you're done, add the features that cannot be tested automatically and that you want other teams looking out for.

• (Example) Added a sprint movement to the player when using the SHIFT key (link your discord tag @Jono)