1. First run this git fetch origin main git merge origin main 2. Then run this commands git fetch origin main:tmp git rebase tmp git push origin HEAD:main git branch -D tmp