Rebase
go to your master and do the following:
- git checkout master
- git reset --hard origin/master
- git checkout yourworkingbranch
- git rebase -i master
- git push -f REMOTE yourworkingbranch
where you should adjust REMOTE and yourworkingbranch
go to your master and do the following:
where you should adjust REMOTE and yourworkingbranch