branch merge 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
//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 3: 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 4: 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 5: git merge branche
/*
-> we have two branches 'dev' and 'master'
-> we want marge or sync branch 'dev' to branch 'master'
*/
// select all changes
$ git add .
// commit changes
$ git commit –m "fix bug ..."
// switch to master
$ git checkout master
Switched to branch 'master'
// start merge
$ git merge dev
Example 6: was pasiert bei git merge
Mit git merge werden Änderungen aus einem anderen Branch in den aktiven Branch übernommen:
$ git merge <commit>