git - how to update my feature/release/hotfix/support branch with new content? -

for example, i'm dealing feature branch, developer pushed right origin/develop latest fix, , have use (add) fix in feature branch.

how should ?

git checkout -b my-feature-branch ... dealing issue ... ... alarm! developer released fix, need here in feature branch ... git stash git checkout develop git pull origin develop git rebase my-feature-branch develop git checkout my-feature-branch git merge develop git stash apply ... dealing issue ... git commit git checkout develop git merge my-feature-develop git push origin develop 

is correct behaviour ?

in case hard figure out branch started , finished. , second point i'm doing rebase public branch (develop) , it's not good, right ?

what proper way update (refresh) working branch new info ?

this seems wrong: git rebase my-feature-branch develop

it should be:

git rebase develop my-feature-branch` 

what need rebase done in my-feature-branch on top of updated develop branch.
no need merge develop in my-feature-branch.

the full sequence looks like

git checkout -b my-feature-branch ... dealing issue ... ... alarm! developer released fix, need here in feature branch ... git stash git checkout develop git pull origin develop  # remember such rebase starts # git checkout my-feature-branch git rebase develop my-feature-branch git stash apply ... dealing issue ... git commit git checkout develop git merge my-feature-develop git push origin develop