merge master into develop code example
Example 1: merge master to dev 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: merge master with main
git checkout master
git pull origin master
git merge test
git push origin master
Example 3: git merge master into branch
$ git checkout master
$ git pull origin/master
$ git merge feature
$ git push origin/master
Example 4: merge master into local branch
git checkout feature1
git merge master
Example 5: how to merge branch to master
First we have to come in the branch
which we want to merge the codes in.
It means generally we should come
into master branch in this case.
- git checkout master ==>
now you are in master branch
- git pull origin master ==>
We are pulling recent code from master branch
on GitHub
- git merge develop -m "your message here" ==>
to merge a develop branch into master branch
- git add .
- git commit -m "final commit"
- git push origin master
- now when other team members pull master
they will see what you sent
*** git rebase LoginFeatureBranch ==>
This will merge Login with Master but
closes the LoginFeatureBranch for good (completely).
Example 6: merge branch into master
$ git add –A
$ git commit –m "Some commit message"
$ git checkout master
Switched to branch 'master'
$ git merge new-branch