https://github.com/andrekovac/git-tic-tac-toe
🎓 Learn to use GitHub pull requests and solve merge conflicts by playing tac-tac-toe ❎🅾️❎
https://github.com/andrekovac/git-tic-tac-toe
Last synced: 4 months ago
JSON representation
🎓 Learn to use GitHub pull requests and solve merge conflicts by playing tac-tac-toe ❎🅾️❎
- Host: GitHub
- URL: https://github.com/andrekovac/git-tic-tac-toe
- Owner: andrekovac
- License: gpl-3.0
- Created: 2021-10-23T08:35:21.000Z (over 4 years ago)
- Default Branch: main
- Last Pushed: 2021-10-23T09:23:06.000Z (over 4 years ago)
- Last Synced: 2023-08-08T02:44:13.425Z (almost 3 years ago)
- Size: 18.6 KB
- Stars: 1
- Watchers: 1
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
- License: LICENSE
Awesome Lists containing this project
README
# Git tic-tac-toe
📚🎓 Learn to use GitHub **pull requests** and solve **merge conflicts** 😐 by playing [tic-tac-toe ❎🅾️❎](https://en.wikipedia.org/wiki/Tic-tac-toe) via git [pull requests](https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests).
## Game board
Example of a valid state of the game after players have taken four turns:
```
| |
X | - | -
_____|_____|_____
| |
- | O | X
_____|_____|_____
| |
- | O | -
| |
```
## How to play
### Preparation
1. All players join either team X or team O.
2. All players clone this repository - you should be in the `main` branch by default.
### First turn
1. Team X begins: Players of team X each create a new local branch (e.g. `git checkout -b move-01`).
2. Players of Team X set an `X` somewhere, e.g. it changes `game-board.txt` to the following for player 1:
```
| |
X | - | -
_____|_____|_____
| |
- | - | -
_____|_____|_____
| |
- | - | -
| |
```
3. Players of Team X commit their changes locally (e.g. `git commit "Ingenious move"`)
4. Players of Team X push the new branch to the remote repository (`git push`) - git might ask you to first create the remote branch - the prompt will contain the command to do so (probably `git push --set-upstream origin move-01`).
5. Inside GitHub players of Team X open a pull request (a.k.a. **PR**) ("New pull request") from the newly created branch onto `main`.
6. Each player adds all other players (including players of Team O) as reviewers to the **PR**.
7. If all reviewers approve the PR, player merges the PR.
- This step might not work right away. In case of **merge conflicts**, players have to discuss in comments of PR and resolve merge conflicts.
- To this end you'll have to pull changes from the remote server (`git pull`) and resolve the conflicts.
### Other turns
- The game continues. Its Team O's turn. All players of Team 0 follow the steps above (just uses `O` as a symbol).
- Teams take turns in this manner until we have a winner or end in a draw.