git-workflows

Interactive rebase lets you reorder, squash, and edit commits before pushing. Run `git rebase -i HEAD~N` (where N is the number of commits) to open an editor, then mark commits as pick, squash, reword, or drop. This creates a clean, review-friendly history without altering published branches.

Worktrees let you work on multiple branches simultaneously without switching your working directory. Use `git worktree add <path> <branch>` to create a parallel checkout. This eliminates context-switching overhead and is ideal when juggling features, hotfixes, or concurrent investigations.

Git bisect performs binary search across your commit history to isolate the buggy commit. Run `git bisect start`, mark the current commit as bad and a known-good commit as good, then test each suggested commit. Bisect narrows the search space exponentially, typically finding the culprit in minutes.

Resolve conflicts by editing files to keep or discard changes, then stage and commit. For complex merges, use `git merge --no-commit` to review before committing, or cherry-pick individual commits selectively. Branch strategies and clear commit hygiene prevent most conflicts upfront.

Rebasing published commits rewrites history and breaks other users' branches. Only rebase unpublished work or use `git push --force-with-lease` on branches you own exclusively. For shared branches, prefer merging or cherry-picking to preserve published history and maintain auditability.

Submodules embed one repository inside another at a fixed commit. Use `git submodule add <repo-url> <path>` to add, then `git submodule update --recursive` to sync. This enforces discipline across complex repos but requires coordinated updates and careful conflict resolution.