Merge Strategy Recipes

# Explicit merge commit for audit/CI gate
git merge --no-ff feature/branch -m "merge(deploy): feature/branch"

# Squash feature PR into main
git checkout main; git merge --squash feature/branch; git commit

# Favor ours during vendor/config sync (auto-resolve drift)
git merge -X ours upstream/config

# Favor theirs to accept upstream defaults
git merge -X theirs upstream/defaults