Merge

Git rebase vs merge with practical examples. When to use each, interactive rebase workflows, squash commits, and team conventions.