how to merge master into branch github code example
Example 1: 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 2: 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 3: git merge master into branch
$ git checkout master
$ git pull origin/master
$ git merge feature
$ git push origin/master
Example 4: 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 5: merge master to a branch
git checkout feature1
git merge master
Example 6: git merge to master
How to merge a branch?
- push all the changes in your current branch
- until it shows ( Everything up-to-date )
- goto your new branch where you wana merge the changes
- git checkout your_branch_name
- git merge development (