merge 2 local branches git code example

Example 1: 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 2: merge branch to master

$ 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

Example 3: git merge local branch

// checkout the branch to merge INTO
git checkout master
// merge local feature branch into master branch
git merge feature_branch_name

Example 4: git merge two branches

git checkout targetBranch
git merge sourceBranch