git checkout master && git pull
git checkout your_branch
git rebase master
→ resolve conflicts if any
git add .
git rebase --continue
git push --force-with-lease origin your_branch
git checkout master && git pull
git checkout your_branch
git rebase master
→ resolve conflicts if any
git add .
git rebase --continue
git push --force-with-lease origin your_branch