git command to create a branch
//Create a New Branch
git checkout -b [name_of_your_new_branch]
//First Push
git push --set-upstream origin [name_of_your_new_branch]
git command to create a branch
//Create a New Branch
git checkout -b [name_of_your_new_branch]
//First Push
git push --set-upstream origin [name_of_your_new_branch]
how to merge git branch to master
git checkout master
git pull origin master
git merge test
git push origin master
git merge branch to another branch
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
merging branches in git
//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 merge branch to another branch
git checkout targetBranch
git merge sourceBranch
git merge branch into another branch
git checkout branch_to_merge_into #Get into the branch first
git merge incomingBranch #merge incomingBranch into branch_to_merge_into
Copyright © 2021 Codeinu
Forgot your account's password or having trouble logging into your Account? Don't worry, we'll help you to get back your account. Enter your email address and we'll send you a recovery link to reset your password. If you are experiencing problems resetting your password contact us