best way to merge master into branch 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: git merge master into branch
$ git checkout master
$ git pull origin/master
$ git merge feature
$ git push origin/master
Example 3: 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 4: merge master into local branch
git checkout feature1
git merge master
Example 5: 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 (