branch merge in git 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
git checkout master
git pull
git merge new-feature
git push
Example 3: merge two branches git
1] you should be on MainBranch -- git checkout MainBranch
2] then run merge command -- git merge SubBranch
Example 4: 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