Git & GitHub

9 pages in this section.

Learn essential Git commands for daily development, including staging, committing, branching, and inspecting repository history.

Git Version Control Fundamentals

Merging & Rebasing

Two strategies for combining branches - merge preserves history as-is, rebase rewrites it for a linear timeline.

Git Merge Rebase Branches

Merge Conflict Resolution Checklist

A step-by-step playbook for resolving merge or rebase conflicts safely. Run the steps in order -- skipping ahead is how clean working trees get clobbered. Every

Git Merge Conflicts Rebase

Git Worktrees Intro

Worktrees let you check out multiple branches at the same time, each in its own directory, all sharing one underlying repository. No more git stash dances when

Git Worktrees Branches Workflow

Git Worktree Examples

Practical, copy-paste examples for the day-to-day worktree workflow: creating, checking out, merging, fetching, and tearing down. All commands assume a recent G

Git Worktrees Branches Merge

GitHub CLI

Manage GitHub pull requests, issues, and repositories from the terminal. Learn to authenticate, create, list, and merge PRs using gh commands.

Git Github CLI Pull Requests

Git Utilities

Power tools for everyday situations - stashing WIP, finding bug-introducing commits, moving commits between branches, and recovering from mistakes.

Git Stash Bisect Cherry Pick

Git Configuration

Set up Git for a productive workflow - identity, aliases, defaults, and .gitignore patterns for Next.js projects.

Git Config Aliases Gitignore

Git & GitHub Highlights Summary

A single-page roundup of every highlight bullet from the 8 pages in the Git & GitHub section, grouped by source page so you can scan all 48 takeaways without opening each article individually.

Highlights Summary Git

Git & GitHub

Search Documentation

Git & GitHub