Rebase my remote branch

git checkout develop
git pull
git checkout my_branch
git rebase develop
git pull --rebase
git commit
git push -f # need the -f?

Only keep my changes

git reset --soft origin/develop
git commit
git push -f