how to merge dev branch into feature branch code example
Example: merge develop to branch
git checkout develop
git pull
git checkout branch-x
git rebase develop
git checkout develop
git pull
git checkout branch-x
git rebase develop