merging master into branch code example
Example 1: git merge branch to master
$ git checkout master
Switched to branch 'master'
$ git merge iss53
Merge made by the 'recursive' strategy.
index.html | 1 +
1 file changed, 1 insertion(+)
Example 2: merge master into local branch
git checkout feature1
git merge master
Example 3: merge master into feature branch
git checkout feature1
git merge master