First successful integration (with game working)
- Can detect people
- Can create profile + login
- Can create + start game
- Can play against AI + player
- AFK managed
- Chat working
Step 1. Fetch and check out the branch for this merge request
git fetch origin git checkout -b "develop" "origin/develop"
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git fetch origin git checkout "master" git merge --no-ff "develop"
Step 4. Push the result of the merge to GitLab
git push origin "master"
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines.
This will create a new commit in order to revert the existing changes.