Rebase Current Branch onto Main
- Check current branch name and confirm with user
- Do NOT create a worktree - work in the current directory
- Run
git fetch origin main && git rebase origin/main - If conflicts exist, list them and resolve one at a time preserving our branch's intent, running
git rebase --continueafter each - Run tests to verify
- Push with
git push --force-with-lease