git checkout master # master is checked out
git pull # update local
git merge new-feature # merge branch new-feature into master
git push # changes on remote. Then checkout a feature 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).
How to merge a branch?
#1 branchName - development
- push all the changes in your current branch
- until it shows ( Everything up-to-date )
#2 branchName - production
- goto your new branch where you wana merge the changes
- git checkout your_branch_name
- git merge development ( #1 branchName )
# DONE ✅