diff --git a/01-essentials/08-multiplayer/01_FACILITATOR.md b/01-essentials/08-multiplayer/01_FACILITATOR.md index 4cab0ff..64c4675 100644 --- a/01-essentials/08-multiplayer/01_FACILITATOR.md +++ b/01-essentials/08-multiplayer/01_FACILITATOR.md @@ -131,15 +131,6 @@ git add numbers.txt git commit -m "feat: add shuffled numbers for challenge" git push ``` - -### Step 4: Verify Student Access - -Students added to the project automatically have access. Verify: - -1. Go to **Project Settings** → **Repositories** → **number-challenge** -2. Click **Security** tab -3. Verify project team has **Contribute** permission - --- ## During the Workshop @@ -153,12 +144,12 @@ Students added to the project automatically have access. Verify: ### The Exercise Flow 1. **Students pull** the latest changes -2. **One person** moves a number to its correct position +2. **One person** creates a branch, moves a number to its correct position 3. **They commit and push** 4. **Others pull** and see the change 5. **Repeat** until sorted -### Creating Conflicts (The Learning Moment) +### Same branch conflicts Conflicts happen naturally when multiple people edit at once. You can encourage this: @@ -166,13 +157,6 @@ Conflicts happen naturally when multiple people edit at once. You can encourage - Watch them experience the push rejection - Guide them through pulling and resolving the conflict -### Monitoring Progress - -Check progress in Azure DevOps: - -- **Repos → Commits**: See who's contributing -- **Repos → Files → numbers.txt**: See current state - ### Common Issues **"I can't push!"**