Problem Statement
Main has moved ahead. Show two safe ways to bring a feature branch up to date and discuss trade-offs.
Explanation
1) `git merge origin/main` → non-destructive, may create merge commits. 2) `git rebase origin/main` → linear history, rewrites commits (avoid if already shared).
Practice Sets
This question appears in the following practice sets: