Tag: Git
5 posts
-
[2026] Git Merge Conflict Resolution Case Study | Merging a 3-Month Refactor Branch
Resolving hundreds of merge conflicts when merging a long-lived refactor into main: strategies, categorization, automation, tests, and safe integration.
-
[2026] Git Merge Conflict Resolution Complete Guide | Strategies, Tools & Case Study
Git merge conflict resolution guide: resolve conflicts in VS Code or CLI, merge vs rebase trade-offs, large refactor branches, lockfiles, and testing af...
-
[2026] Interactive Git Rebase | pick, squash, fixup, Conflict Resolution, Recovery
Use git rebase -i to edit commits: pick, squash, fixup, reword, edit, resolve conflicts, and recover with reflog—practical order for real work.
-
[2026] Git Submodules in Practice | Add, Update, CI, and Monorepo Alternatives
Git submodules: how to pull sub-repos, init/update/delete, CI caching, common pitfalls, and when to prefer a monorepo instead.
-
[2026] 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 rules—...