diff --git a/01-essentials/03-branching-and-merging/README.md b/01-essentials/03-branching-and-merging/README.md index d50aa3f..455deaf 100644 --- a/01-essentials/03-branching-and-merging/README.md +++ b/01-essentials/03-branching-and-merging/README.md @@ -307,44 +307,6 @@ git merge main git pull origin main ``` -## Troubleshooting - -### "I'm on the wrong branch!" - -```pwsh -# Switch to the correct branch -git switch correct-branch - -# Check current branch anytime -git branch -``` - -### "I made commits on the wrong branch!" - -Don't panic! You can move commits to another branch: - -```pwsh -# Create the correct branch from current state -git branch correct-branch - -# Switch to wrong branch and remove the commits -git switch wrong-branch -git reset --hard HEAD~2 # Remove last 2 commits (adjust number) - -# Switch to correct branch - commits are there! -git switch correct-branch -``` - -### "The merge created unexpected results!" - -```pwsh -# Undo the merge -git merge --abort - -# Or if already committed: -git reset --hard HEAD~1 -``` - ### "I want to see what changed in a merge!" ```pwsh @@ -368,13 +330,13 @@ git diff main..feature-branch After completing this module, you understand: -- ✅ Branches create independent lines of development -- ✅ `git switch -c` creates a new branch -- ✅ Changes in one branch don't affect others -- ✅ `git merge` combines branches -- ✅ Merge commits have two parent commits -- ✅ `git log --graph` visualizes branch history -- ✅ Branches are pointers, not copies of files +- Branches create independent lines of development +- `git switch -c` creates a new branch +- Changes in one branch don't affect others +- `git merge` combines branches +- Merge commits have two parent commits +- `git log --graph` visualizes branch history +- Branches are pointers, not copies of files ## Next Steps diff --git a/01-essentials/08-multiplayer/01_FACILITATOR.md b/01-essentials/08-multiplayer/01_FACILITATOR.md index 21233b8..f0433b5 100644 --- a/01-essentials/08-multiplayer/01_FACILITATOR.md +++ b/01-essentials/08-multiplayer/01_FACILITATOR.md @@ -235,5 +235,3 @@ To reuse the repository: - **Keep groups small** (2 people per repository) for more interaction - **Encourage communication** - the exercise works best when people talk - **Let conflicts happen** - they're the best learning opportunity -- **Walk the room** - help students who get stuck -- **Point students to 03_TASKS.md** - Simple explanations of clone, push, pull, and fetch for beginners