git merge local branch to master code example
Example 1: git create new branch
// create and checkout new branch in one line
git checkout -b new_branch
Example 2: how to merge git branch to master
git checkout master
git pull origin master
git merge test
git push origin master
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: 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 5: merge branch to master
$ git checkout master
$ git branch new-branch
$ git checkout new-branch
$ git add –A
$ git commit –m "Some commit message"
$ git checkout master
$ git merge new-branch
Example 6: merge master into local branch
git checkout feature1
git merge master