Version Control

Git is the universal version control system for software development. Understanding Git beyond add, commit, and push — the object model, rebase vs. merge, branching strategies, and conflict resolution — makes you a faster, more confident collaborator and signals seniority in interviews and code reviews.

What You'll Find Here

Topic	Description
Git Basics	The three-area model, core commands, branching, .gitignore, and the daily workflow from init to push.
Git Object Model	Blobs, trees, commits, tags — how Git stores data as a content-addressable store.
Branching Strategies	Git Flow, GitHub Flow, trunk-based development — when each fits.
Rebase vs. Merge	Linear history vs. merge commits; interactive rebase for cleaning up commits.
Working with Remotes	fetch, pull, push, tracking branches, upstream conventions.
Conflict Resolution	Three-way merge, git rerere, merge tools.
Git Hooks & Workflows	Pre-commit hooks for linting; PR workflows; protected branches.

Learning Path

1. Git Basics — start here if you're returning after a gap; the three-area model, core commands, and daily workflow.
2. Git Object Model — understanding SHA-1 content addressing makes reset, revert, and reflog intuitive.
3. Branching Strategies — trunk-based development is the modern default for CI/CD-heavy teams.
4. Rebase vs. Merge — this is the most-debated Git question in team settings; know both and the trade-offs.
5. Working with Remotes — fetch vs. pull, upstream tracking, fork workflows.
6. Conflict Resolution — three-way merge, rerere, and the right tools for complex conflicts.
7. Git Hooks & Workflows — pre-commit hooks enforce code quality without CI round-trips.

Related Domains

• DevOps — branching strategies directly shape CI/CD pipeline design.
• Build Tools — Maven/Gradle version management pairs with semantic versioning in Git tags.