Git Create Branch and Merge

$ git checkout -b [name_of_your_new_branch]
after completetion

git status ==== to check pages modified
git add
git add
git commit -m “#ticketed :: comment here”
git push origin

to merge in dev

git checkout dev
git pull origin dev
git merge
git push origin dev

to merge in master

git checkout master
git pull origin master
git merge
git push origin master

 

To see after conflict

press esc
:wq

To undo work
git stash

Share on Facebook0Tweet about this on Twitter0Share on Google+0Pin on Pinterest0Share on LinkedIn0Share on Reddit0
It's only fair to share...

Add Comment

Required fields are marked *. Your email address will not be published.