git checkout develop git pull git checkout feature-brach git rebase develop //if there are any conflicts, you have to resolve them