git merge from branch 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: 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: 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 4: git merge

git checkout master			# master is checked out
git pull					# update local
git merge new-feature		# merge branch new-feature into master
git push					# changes on remote. Then checkout a feature branch