Merge Process

Quick-steps

1. Pull all changes from origin/master.

2. Create a new local branch from origin/master.

3. Implement your changes and commit to your branch, pushing to origin periodically.

4. When all of your changes are complete, pull all changes from origin/master to local/master.

5. Rebase your local branch onto local/master.

6. Resolve any conflicts in your branch.

7. Push your branch to the remote server.

   • Repeat the last four steps as necessary for your development.

8. Create a Merge Request in GitLab to merge your branch into origin/master.

   • The merge request will tell you if you need to rebase or perform other work to get synchronized.

9. Checkout the merging branch locally.

10. Clean your solution for both Debug and Release.

    • In Visual Studio, you can use the Build/Batch Build... command to simplify this process.

11. Build your solution for both Debug and Release.

12. Run Bootstrap for both Debug and Release.

    • Verify the DigiPen splash screen appears.

    • Verify the menu appears after the first 5 seconds.

    • Verify the ‘Enter’ key brings up the game.

13. Run Editor for both Debug and Release.

    • Verify you can open the ProjectBoomerang.prj file.

    • Verify you can open the StressTest scene.

    • Verify you can see the Gizmo when you select an object in the hierarchy

    • Move the camera (pan, zoom, nudge) to see the object.

    • Verify you can add, modify and delete components.

    • You do not need to save the scene.

14. If all verification checks pass, in GitLab you may Merge the merge request.

    • The merge request will close automatically.