how to merge branch develop into my branch code example
Example 1: merge branch to branch
git checkout master
git merge new-branch
git pushExample 2: merge develop to branch
git checkout develop
git pull
git checkout branch-x
git rebase developgit checkout master
git merge new-branch
git pushgit checkout develop
git pull
git checkout branch-x
git rebase develop