Arrow keys or swipe · F for fullscreen
Dev Workshop
Hands-On
Workshop

Mastering Git & GitHub

A hands-on workshop from zero to confident contributor. Follow along on your own machine.

01 / 10
Dev Workshop
Hands-On
Overview

What You'll Learn

  • Initialize repos & make commits
  • Branching & merging strategies
  • Pull requests & code review
  • Resolving merge conflicts
02 / 10
Dev Workshop
Hands-On
Before We Start

Setup Check

Make sure everything is ready before we dive in.

Prerequisites
Git installed (git --version)
GitHub account created
Terminal or VS Code ready
A sense of adventure
03 / 10
Dev Workshop
Hands-On
Essentials

Core Commands

Terminal
git init          # Start a repo
git add .         # Stage changes
git commit -m ""  # Save snapshot
git push          # Upload to remote
git pull          # Download changes
04 / 10
Dev Workshop
Hands-On
Workflow

Branching Strategy

main — production-ready code
develop — integration branch
feature/* — new features
hotfix/* — emergency fixes
05 / 10
Dev Workshop
Hands-On
Hands-On

Exercise 1

Try It
1. Create a new repo on GitHub
2. Clone it locally
3. Create a file, add, commit
4. Push to remote
5. Check GitHub — your code is there!
06 / 10
Dev Workshop
Hands-On
Collaboration

Pull Requests

  • Fork or branch the repo
  • Make your changes
  • Push and open a PR
  • Request review
  • Merge when approved

Pull requests are the heart of collaboration.

07 / 10
Dev Workshop
Hands-On
Troubleshooting

Merge Conflicts

Conflicts happen when two branches change the same lines. They're normal and fixable.

The Fix
Open the conflicted file. Look for <<<<<<< markers. Choose which changes to keep. Remove the markers. Add, commit, done.
08 / 10
Dev Workshop
Hands-On
Best Practices

Pro Tips

  • Write clear commit messages
  • Commit early, commit often
  • Never force push to main
  • Use .gitignore from day one
09 / 10
Dev Workshop
Hands-On
Next Steps

Keep Practicing

Resources
git-scm.com — Official docs
GitHub Skills — Interactive courses
10 / 10