how to merge from new branch code example
Example 1: git merge
git checkout master # master is checked out
git pull # update local
git merge new-feature # merge branch new-feature into master
git push # changes on remote. Then checkout a feature branch
Example 2: how to merge a branch into another branch
git checkout YourBranch
git merge develop