Rebase

go to your master and do the following:

1. git checkout master
2. git reset --hard origin/master
3. git checkout yourworkingbranch
4. git rebase -i master
5. git push -f REMOTE yourworkingbranch

where you should adjust REMOTE and yourworkingbranch