git checkout master
git pull origin master
git merge test
git push origin master
//Make sure you are in your branch. Develop is a a branch in this case
git checkout master
Switched to branch 'master'
git pull
To pull changes of team members to your master
git checkout develop
git merge master
Resolve Conflicts in develop
git checkout master
git merge develop
To merge your final changes along with other changes to your master
git pull
If there were any additional changes made meanwhile
git push
To push the final master to the master repository
git checkout develop
//Move to branch again to work
$ git checkout master
Switched to branch 'master'
$ git merge iss53
Merge made by the 'recursive' strategy.
index.html | 1 +
1 file changed, 1 insertion(+)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).
$ git checkout master
$ git branch new-branch
$ git checkout new-branch
# ...develop some code...
$ git add –A
$ git commit –m "Some commit message"
$ git checkout master
$ git merge new-branch
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).