how to merge local branch code example
Example 1: 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 2: git merge branch
//this is for merging into a local branch//
// checkout the branch to merge INTO
git checkout master
// merge local feature branch into master branch
git merge feature_branch_name
Example 3: how to merge a branch into another branch
git checkout YourBranch
git merge develop
Example 4: merge branch to master
$ git checkout master
$ git branch new-branch
$ git checkout new-branch
$ git add –A
$ git commit –m "Some commit message"
$ git checkout master
$ git merge new-branch