git merge into master 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: merge branch to branch
git checkout master
git merge new-branch
git push
Example 5: merge git branch
1. //pull the latest changes of current development branch if any
git pull (current development branch)
2. //switch to master branch
git checkout master
3. //pull all the changes if any
git pull
4. //Now merge development into master
git merge development
5. //push the master branch
git push origin master
Example 6: 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(+)