xxxxxxxxxx
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).
xxxxxxxxxx
git checkout master
git pull origin master
git merge test
git push origin master
xxxxxxxxxx
- git checkout master #change to master branch
- git pull origin master #update your master branch from GitHub
- git merge <branchname> -m "your message here" #merge a branch into master branch
- git add .
- git commit -m "final commit"
- git push origin master
xxxxxxxxxx
git checkout <branchname>
git merge master -m 'your message here'
git push origin <branchname>
xxxxxxxxxx
# 2. merge feature branch to origin/master branch
$ git checkout master
$ git pull origin/master
$ git merge feature
$ git push origin/master
xxxxxxxxxx
# 1. Switch to the master branch
git checkout master
# 2. Pull the latest changes from the remote master branch
git pull origin master
# 3. Merge the branch into master
git merge branch-name
# 4. Push the changes to the remote master branch
git push origin master
xxxxxxxxxx
$ 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