Q:

git merge master into branch

$ git checkout master
Switched to branch 'master'
$ git merge iss53
Merge made by the 'recursive' strategy.
index.html |    1 +
1 file changed, 1 insertion(+)
14
git checkout master
git pull origin master
git merge test
git push origin master
7
$ 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
3
git checkout dmgr2      # gets you "on branch dmgr2"
git fetch origin        # gets you up to date with origin
git merge origin/master
2
git checkout feature1
git merge master
1
# 2. merge feature branch to origin/master branch
$ git checkout master
$ git pull origin/master

$ git merge feature
$ git push origin/master
0
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).
0

New to Communities?

Join the community