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 6 posts
-
Git for Beginners: Install, Configure, Commit, Branch and Push to a Remote
A beginner-friendly Git guide covering installation, commits, branches, and remote repositories with hands-on command examples.
-
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.
-
Git Interactive Rebase: Squash, Fixup, Reword, Split, and Recovering from a Bad Rebase
Use git rebase -i to squash WIP commits, reword messages, split and reorder commits before a PR, and recover when a rebase conflicts or goes wrong.
-
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.
-
Git Submodules in Practice: Add, Clone, Update, Remove, CI Caching and Common Pitfalls
Git submodules: how to pull sub-repos, init/update/delete, CI caching, common pitfalls, and when to prefer a monorepo instead.
-
Git Team Workflow: Branching Strategies, Pull Request Reviews and Commit Conventions
Best practices for Git branching strategies, pull request reviews, and commit conventions for teams shipping code together.