Skip to content

Latest commit

Β 

History

History
46 lines (32 loc) Β· 1.72 KB

README.md

File metadata and controls

46 lines (32 loc) Β· 1.72 KB

Git & GitHub Masterclass β€” Workshop Repository

This repository is the shared, hands-on companion to Tech4Dev's TCLA Masterclass: "Solving Complex Merge Conflicts and Managing Branches Safely with Git and GitHub" (Facilitator: David Edu β€” 31 July & 1 August 2026).

What This Repo Is For

  • Day 1: Clone it, branch off it, and practice your first merge conflicts locally (Labs 1–3).
  • Day 2: Push real branches, open real Pull Requests, and collaborate with the rest of the cohort on this exact repo (Labs 4–7).
  • After the masterclass: This repo stays open. Fork it, break it, fix it β€” that's what it's here for.

Slide Decks

Quick Start

```bash git clone https://github.com/daveeedu/masterclass-demo.git cd git-masterclass-workshop ```

See docs/setup.md for the full local setup, and assignments.md for your Day 2 assigned branch/feature.

Resources

Branch Naming Convention

Pattern Used for
lab1/<name>-bio Lab 1 β€” Basic Branching
lab3a/<name>-conflict, lab3b/<name>-conflict Lab 3 β€” Conflict Resolution
lab4/<name>-cleanup Lab 4 β€” Rebase practice
participant-<letter>/<feature> Lab 5 β€” Day 2 Collaborative Workshop (assigned, see assignments.md)

License

Educational use. Fork freely.