git merge branch into current branch code example
Example 1: how to merge git branch to master
git checkout master
git pull origin master
git merge test
git push origin master
Example 2: merging branches in git
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
Example 3: merge branch to branch
git checkout master
git merge new-branch
git push
Example 4: merge git branch
1.
git pull (current development branch)
2.
git checkout master
3.
git pull
4.
git merge development
5.
git push origin master
Example 5: git create new branch
git checkout -b new_branch
Example 6: how to merge a branch into another branch
git checkout YourBranch
git merge develop