git checkout your-branch git rebase main git add <file> git rebase --continue git push origin your-branch --force