Git Practical Guide Series
From Git installation to basic commands, branch strategies, and GitHub collaboration
Learn everything you need for practical Git usage step by step.
Total 9 posts
- 1
Git Beginners Guide | Install· Commit
A beginner-friendly Git guide covering installation, commits, branches, and remote repositories with hands-on command examples.
- 2
Git Merge Conflict Resolution Case Study
Resolving hundreds of merge conflicts when merging a long-lived refactor into main: strategies, categorization, automation, tests, and safe integration.
- 3
Git Interactive Rebase Guide | Squash· Fixup
Master git rebase -i for clean commit history.
- 4
Git Merge Conflict Resolution Complete Guide | Strategies
Git merge conflict resolution guide: resolve conflicts in VS Code or CLI, merge vs rebase trade-offs, large refactor branches, lockfiles, and testing.
- 5
Interactive Git Rebase | pick· squash
Use git rebase -i to edit commits: pick, squash, fixup, reword, edit, resolve conflicts, and recover with reflog—practical order for real work.
- 6
Git reset vs revert — undo commits safely
git reset (--soft, --mixed, --hard) vs git revert, restore and checkout roles, interactive rebase, conflicts, force push risks, and reflog recovery.
- 7
Git Undo & History | reset, revert, and rebase explained
reset vs revert vs restore, interactive rebase (squash, fixup, reword), conflict resolution, force push and reflog recovery, merge vs rebase team.
- 8
Git Submodules in Practice | Add· Update
Git submodules: how to pull sub-repos, init/update/delete, CI caching, common pitfalls, and when to prefer a monorepo instead.
- 9
Git Workflow Best Practices | Branching· PR Reviews
Best practices for Git branching strategies, pull request reviews, and commit conventions for teams shipping code together.