how to merge master branch with another branch code example
Example 1: how to merge a branch into another branch
git checkout YourBranch
git merge develop
Example 2: merge master to a branch
git checkout feature1
git merge master
git checkout YourBranch
git merge develop
git checkout feature1
git merge master