chore: cleanup

01-essentials/08-multiplayer/03_README.md

@@ -128,7 +128,8 @@ git pull
 
     # Now we resolve the merge. We're merging the main branch INTO the feature-2 branch.
     git merge main
-    # Resolve the merge conflict in numbers.txt
+    # Resolve the merge conflict in numbers.txt by opening in VSCode and choosing the changes you want.
+    # How you solve it is up to you.
     # Once resolved
     git add numbers.txt
     git commit
@@ -142,30 +143,29 @@ git pull
 
 | Command | What It Does |
 |---------|--------------|
-| `git switch -c <name>` | Create and switch to new branch |
-| `git push -u origin <branch>` | Push branch to Azure DevOps |
-| `git switch main` | Switch to main branch |
+| `git switch -c <branch-name>` | Create and switch to new branch |
+| `git switch <branch-name>` | Switch to branch |
+| `git push` | Push branch to Azure DevOps |
 | `git pull` | Get latest changes from remote |
 
 ---
 
-## Common Issues
+## Cheatsheet
 
-### "My PR has conflicts"
-1. Update your branch with latest main:
-   ```powershell
-   git switch main
-   git pull
-   git switch <branch-name>
-   git merge main
-   ```
-2. Resolve conflicts in VS Code
-3. Commit and push again
+### Solving merge conflicts
+```pwsh
+git switch main
+git pull
+git switch <branch-name>
+git merge main
+# ... Solve the conflicts
+git push
+```
 
 ### "I need to make more changes to my PR"
 
 Just commit and push to the same branch - the PR updates automatically:
-```powershell
+```pwsh
 git add .
 git commit -m "fix: address review feedback"
 git push