Welcome to Day 2! Today we move beyond your local machine — you'll resolve conflicts, collaborate on GitHub, and learn power-user techniques.
By the end of today you will be able to:
- Confidently resolve merge conflicts.
- Use remotes, push, pull, and collaborate through pull requests.
- Use
stashto save work-in-progress without committing. - Recover "lost" commits with
reflog. - Apply selective commits with
cherry-pick. - Rewrite history cleanly with interactive rebase.
| Time | Topic |
|---|---|
| 10:00 – 10:15 | Day 1 Recap & Questions |
| 10:15 – 11:00 | Resolving Merge Conflicts |
| 11:00 – 11:15 | Break |
| 11:15 – 12:15 | Remote Collaboration & Pull Requests |
| 12:15 – 12:45 | Lunch Break |
| 12:45 – 13:45 | Collaborative Exercise (Counter App) |
| 13:45 – 14:30 | Advanced Techniques |
| 14:30 – 15:00 | Best Practices, Q&A & Wrap-up |
| # | Exercise | Topic |
|---|---|---|
| 1 | When Worlds Collide | Merge conflicts, resolution, --abort |
| 2 | Team Up | Remotes, PRs, collaborative workflow |
| 3 | Power User | stash, reflog, cherry-pick, rebase |
Reminder: Make sure your GitHub account is set up and you can push/pull. See setup instructions if needed.