$ git checkout master

$ git pull origin master && git fetch (gets the latest changes from master branch and update the `.git` branches)

$ git checkout <your-working-branch>

$ git rebase origin/master (updates your current branch with latest changes from master)
   - Make sure fix any conflicts

$ git add .

$ git rebase --continue

$ git push origin <your-working-branch> -f