Rebase the current branch onto production:
1. Fetch latest production: `git fetch origin production`
2. Rebase current branch: `git rebase origin/production`
3. If conflicts occur:
- Only resolve if solution is unambiguous (e.g., pure additions, clear duplicates)
- Otherwise, ask user which resolution approach to take:
- Keep current changes
- Keep production changes
- Manual merge of specific sections
4. After resolving: `git rebase --continue`
5. Force push if needed: `git push --force-with-lease`
Always rebase from production branch, never from other branches.