majiayu000 Squash and Rebase 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 - Run
git rebase -i origin/mainβ in the editor, squash or fixup commits as appropriate, leaving one clean commit (or a small number of logical commits) with a descriptive message - 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