git merge -no-ff develop code example

Example: merge develop to branch

git checkout develop 
git pull 
git checkout branch-x
git rebase develop