merge branch to master git code example

Example 1: git new branch

$ git checkout -b [your_branch_name]
# Switched to a new branch [your_branch_name]

# This is shorthand for:
$ git branch [your_branch_name]
$ git checkout [your_branch_name]

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: merging branches in git

//Make sure you are in your branch. Develop is a a branch in this case

git checkout master
Switched to branch 'master'

git pull
To pull changes of team members to your master

git checkout develop
git merge master
Resolve Conflicts in develop

git checkout master
git merge develop
To merge your final changes along with other changes to your master

git pull
If there were any additional changes made meanwhile

git push
To push the final master to the master repository

git checkout develop
//Move to branch again to work

Example 4: 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 5: 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 6: git merge master into branch

# 2. merge feature branch to origin/master branch
$ git checkout master
$ git pull origin/master

$ git merge feature
$ git push origin/master