Rebase branch with master

supposing you are in your feature branch

$ git checkout master
$ git pull --rebase
$ git checkout <feature_branch>
$ git rebase master

# if you have conflicts:
# fix them!
# git add <file_path>
# git rebase --continue

$ git push --force origin <feature_branch>