git merge into master branch code example

Example 1: git merge origin/master into branch

git checkout dmgr2      # gets you "on branch dmgr2"
git fetch origin        # gets you up to date with origin
git merge origin/master

Example 2: how to merge git branch to master

git checkout master
git pull origin master
git merge test
git push origin master

Example 3: how to merge branch to master

First we have to come in the branch which we want to merge the codes in. 
It means generally we should come into master branch in this case.
- git checkout master ==> now you are in master branch
- git pull origin master ==> We are pulling recent code from master branch 
on GitHub
- git merge develop -m "your message here" ==> to merge a develop branch 
into master branch 
- git add . 
- git commit -m "final commit"
- git push origin master
- now when other team members pull master they will see what you sent
*** git rebase LoginFeatureBranch ==> This will merge Login with Master but 
closes the LoginFeatureBranch for good (completely).

Example 4: merge branch to master

$ git checkout master
$ git branch new-branch
$ git checkout new-branch

# ...develop some code...

$ git add –A
$ git commit –m "Some commit message"
$ git checkout master
$ git merge new-branch

Example 5: merge master into local branch

git checkout feature1
git merge master