GuideBeginner
Git & GitHub Guide
Master version control with Git and collaborative development with GitHub, from your first commit to production CI/CD pipelines. This guide walks you step by step through everything you need to work professionally with Git: local workflow, branches, conflict resolution, Pull Requests, team workflows, automation with hooks and GitHub Actions, and error recovery. Built for developers of any language who want to stop fearing Git and start using it with confidence on real teams.
- 104
- lessons
- 13
- modules
- English · Spanish
- available in
- Included in the Club
- access
Outcomes
What you'll be able to do
- Version control fundamentals: commits, staging, branching, and merging
- Safely undoing changes with restore, reset, and revert
- Resolving merge conflicts in real-world scenarios
- Collaborating on GitHub with remotes, clone, push, pull, and SSH keys
- Creating and reviewing Pull Requests with professional merge strategies
- Implementing team workflows: Feature Branch, GitFlow, and Trunk-Based Development
- Managing projects with GitHub Issues, Projects, and Releases
- Automating quality checks with Git Hooks and Husky
- Building CI/CD pipelines with GitHub Actions
- Recovering from mistakes using reflog and advanced troubleshooting
Before you start
What you need to bring
It's for you if...
- Developers of any language who want to learn version control from scratch
- Developers with basic Git knowledge who want professional workflows and automation
- Programming students who need Git for academic and team projects
- Professionals transitioning to tech who need Git to work in development teams
- Team leads who want to establish standard Git workflows for their teams
Requirements and materials
- Basic terminal/command line usage (cd, ls, mkdir, touch)
- Code to version (any programming language)
- A free GitHub account
- No prior Git or version control experience required
Content
The syllabus, module by module
Open any of them to see its lessons.
- 01. Introduction to Module 1: Why Git?
- 02. Git History and Core Concepts
- 03. Installing Git
- 04. Initial Git Setup
- 05. Your First Repository (git init)
- 06. Staging Area and git add
- 07. Your First Commit (git commit)
- 08. Mini-project: Your First Complete Repository
- 01. Introduction to Module 2: The Basic Local Workflow
- 02. git status in Depth
- 03. git diff - Seeing Changes
- 04. git log - Navigating History
- 05. git show - Inspecting Commits
- 06. Advanced git log - Searches and Filters
- 07. Aliases and an Optimized Workflow
- 08. Mini-project: The Day-to-Day Workflow
- 01. Introduction to Module 3: Undoing Changes
- 02. git restore - Working Directory
- 03. git restore --staged (Unstaging)
- 04. git reset - Soft, Mixed, Hard
- 05. git reset - Advanced Scenarios
- 06. git revert - Undoing Public Commits
- 07. git clean and Advanced Recovery
- 08. Mini-project: Recovery Scenarios
- 01. Introduction to Module 4: Branches and Merging
- 02. git branch - Creating and Managing Branches
- 03. git checkout and git switch - Switching Branches
- 04. git merge - Fast-Forward
- 05. git merge - 3-Way Merge and Conflicts
- 06. Branching Strategies
- 07. Advanced Conflict Resolution
- 08. Mini-project: Multi-Branch Workflow
- 01. Introduction to Module 5: GitHub and Remote Collaboration
- 02. Configure GitHub and Your First Remote
- 03. git clone - Cloning Repositories
- 04. git push - Uploading Changes
- 05. git pull - Downloading Changes
- 06. git fetch - Updating Without Merging
- 07. Upstream and Multiple Remotes
- 08. Mini-project: Full Collaboration with GitHub
- 01. Introduction to Module 6: Remote Conflicts
- 02. Push Rejected and Pull Conflicts
- 03. Safe Force Push
- 04. Conflicts in Pull Requests
- 05. Advanced Branch Synchronization
- 06. Recovering from Remote Disasters
- 07. Systematic Conflict Prevention
- 08. Mini-project: Conflicts on a Real Team
- 01. Introduction to Module 7: Pull Requests and Code Review
- 02. GitHub CLI and Your First PR
- 03. Anatomy of a Good Pull Request
- 04. The Code Review Process
- 05. Merge Strategies Compared
- 06. PR and Code Review Best Practices
- 07. Advanced PR Management and Conflict Resolution
- 08. Mini-Project: An End-to-End Pull Request Workflow
- 01. Introduction to Module 8: GitHub Issues and Project Management
- 02. GitHub Issues - Fundamentals
- 03. Linking Issues and Pull Requests
- 04. GitHub Projects - Kanban
- 05. Milestones and Releases
- 06. Labels, Assignees, and Organization
- 07. Project Management Workflows
- 08. Mini-Project: Complete Project Management
- 01. Introduction to Module 9: Advanced Git Workflows
- 02. Feature Branch Workflow
- 03. Complete Gitflow
- 04. Trunk-Based Development
- 05. GitHub Flow
- 06. Branch Protection and Policies
- 07. Monorepo vs Multi-Repo Strategies
- 08. Mini-Project: Implement Complete Gitflow
- 01. Introduction to Module 10: Interactive Rebase
- 02. Interactive Rebase Fundamentals
- 03. Squash and Fixup
- 04. Reordering and Editing Commits
- 05. Autosquash Workflow
- 06. Advanced History Rewriting
- 07. Dangers and Recovery
- 08. Mini-Project: Clean Up an Entire History
- 01. Introduction to Module 11: Git Hooks and Automation
- 02. Git Hooks Fundamentals
- 03. Husky Setup
- 04. Lint-Staged Integration
- 05. Commitizen and Conventional Commits
- 06. Advanced Custom Hooks
- 07. Bypass and Troubleshooting
- 08. Mini-Project: Complete Automation Setup
- 01. Introduction to Module 12: GitHub Actions CI/CD
- 02. GitHub Actions Fundamentals
- 03. Matrix Testing
- 04. Deploy Automation
- 05. Secrets Management
- 06. Advanced Workflows
- 07. Performance Optimization
- 08. Mini-Project: Complete CI/CD
- 01. Introduction to Module 13: Git Internals (Optional)
- 02. The .git/ Directory
- 03. The 4 Object Types
- 04. SHA-1 and Content-Addressable Storage
- 05. Refs, HEAD, and Branches
- 06. Packfiles and Compression
- 07. Plumbing vs Porcelain
- 08. Mini-Project: Explore Git Internals
Where it fits
This guide is part of something bigger
It's studied inside these programs, with support and dates.
Common questions
What people usually ask
As long as your Club subscription is active. If you cancel and come back later, you get the access and your progress back.
No. Modules run from easier to harder, but you can jump to the one you need. Progress is saved per lesson.
Whatever is needed is listed under “What you need to bring”, above. If nothing is listed there, you can start from zero.
In the Club's WhatsApp group, and every two weeks there's a live with an instructor where questions get worked through.
No. This guide is self-paced with no dates. The bootcamp is live, by cohort, with work someone reviews.
Start whenever you like
What students say
These reviews are from enrolled students who completed at least 50% of the course. We moderate reviews only on content grounds (spam, offensive language, personal data), never for being critical or negative.
No approved reviews yet.
Be the first to share your experience!