C
Collaboration & Git//Lesson 01

Collaboration & Git

30 min·theory

Collaboration & Git

🎯 After reading this lesson

After completing this lesson, you will be able to confidently do the following three things.

  • ✅ Collaboration patterns in "Collaboration & Git (distributed version control)"
  • ✅ Team workflows (PR (Pull Request), branch (feature branching), merge (merging branches))
  • ✅ Real-world pitfalls (conflict (same-line collision), rebase (rebasing a branch))

Keep the learning objectives as a checklist, and close this lesson once you can answer all of them.

👨‍💻 4 People Behind Git/GitHub — From Distributed Version Control to a Collaboration Platform

01
Linus TorvaldsLinus Torvalds
Creator of Git & LinuxLinux Foundation1969~Present

The person who created Linux — and then built Git 'in just two weeks'

  • 1991 Released Linux kernel 0.01 from the University of Helsinki
  • 2005 Developed Git in response to the BitKeeper licensing dispute — first commit on April 7
  • 2005 Migrated Linux kernel development to Git in just two weeks
  • 2012 Awarded the Millennium Technology Prize — recognizing both Git and Linux as landmark achievements
Git — the standard for all distributed version control tools and the foundation of modern collaborationGIT · Creator
02
Junio HamanoJunio C. Hamano
Git MaintainerGoogle2005~Present

The maintainer who took over Git from Torvalds and has kept it running for over 20 years

  • 2005 Core contributor from Git's earliest days — began collaborating with Torvalds
  • 2005 Took over the maintainer role from Torvalds (July)
  • 2011 Joined Google — full-time support for Git maintainer work
  • 2025 Has personally managed and reviewed nearly every Git release for 20 years
The guardian of Git's stability and compatibility — the reason the tool became a standardGIT · Maintainer
03
Tom Preston-WernerTom Preston-Werner
Co-founder of GitHubGitHub → Chatterbug → RedwoodJS1979~Present

The co-founder who made Git 'collaboration in the browser' and ignited an explosion in the open-source ecosystem

  • 2008 Co-founded GitHub with Chris Wanstrath and PJ Hyett
  • 2008 Released Jekyll static site generator — the foundation of GitHub Pages
  • 2014 Resigned as GitHub president — stepped down amid an internal incident
  • 2020 Co-founded the RedwoodJS framework — venturing into full-stack JavaScript
GitHub, Jekyll, Gravatar — the infrastructure of developer public collaboration cultureGITHUB · Co-founder
04
Chris WanstrathChris Wanstrath
Co-founder & First CEO of GitHubGitHub → Microsoft1984~Present

The founding CEO who led GitHub for 10 years and turned it into 'the Facebook for developers'

  • 2008 Co-founded GitHub with Tom Preston-Werner and PJ Hyett
  • 2008 Became GitHub's first CEO — established the free public repository model
  • 2014 GitHub surpassed tens of millions of users — effectively becoming the standard collaboration platform
  • 2018 Sold GitHub to Microsoft for $7.5 billion and stepped down as CEO
10 years at the helm of GitHub — the person who elevated open-source collaboration into industry infrastructureGITHUB · Founding CEO
👥
In a nutshell
Torvalds (created Git) → Hamano (20-year maintainer) → Preston-Werner & Wanstrath (founded GitHub). These four people built the backbone of distributed version control and the collaboration platform.

Why You Need to Know Collaboration & Git

Bottom line: Code is never written alone. Git, PR, and code review account for 80% of team productivity.


Tool Mapping

AreaStandard
Version ControlGit (distributed version control) · GitHub · GitLab · Bitbucket · Sapling (Meta's next-gen client)
PR (Pull Request) workflowGitHub Flow (simple: main + feature) · Git Flow · Trunk-Based (short branches, frequent merges)
Commit ConventionConventional Commits · Angular
Code ReviewGitHub Reviews · Reviewable
Issue TrackingGitHub Issues · Linear · Jira
DocumentationREADME · ADR (Architecture Decision Record) · Notion

5 Key Reasons

ReasonMeaning
branchFeature isolation = safe experimentation. Main is always deployable. External contributions via fork (repository copy)
PR (Pull Request) + reviewTwo-person code review = fewer bugs + knowledge sharing
Conflict resolution (merge conflict)It's everyday work. Not being afraid of it is the key
Commit conventionfeat: · fix: → automatic changelog + readability
rebase vs mergeLinear history vs preserved history. Depends on team policy

Key takeaway: People who use Git well can make large-scale code changes safely. Those who don't end up working weekends.

🤖 Try Asking AI Like This

Knowing the concepts in this lesson lets you give AI specific instructions. Not a vague 'fix it for me,' but a request with vocabulary — that's where token savings begin.

  • "Rewrite this PR (Pull Request) body using the '## Summary / ## Test plan / ## Risks' template"
  • "Give me 3 examples of effective code review comments (question-style + suggesting alternatives)"
  • "Clean up this feature branch with rebase (move the branch on top of main)"

Why This Reduces Tokens

Without understanding the concepts, even after receiving an AI answer you have to ask 'What does that mean?' all over again. That follow-up question is what eats up tokens. Learn the concept once, and the conversation ends in one go.

Collaboration & Git - Collaboration & Git