Git Bash common commands

git-commands.md

Branch: create new

git checkout -b featurebranch

Branch: checkout remote one

git checkout featurebranch

Branch: view all (remote and local)

git branch -a

Merge: develop in local branch

git merge develop

Merge: use my or others changes while merging

git checkout --theirs web/*
git checkout --ours web/index.html

References

• http://stackoverflow.com/questions/2003505/delete-a-git-branch-both-locally-and-remotely
• http://stackoverflow.com/questions/1783405/checkout-remote-git-branch
• http://gitready.com/advanced/2009/02/25/keep-either-file-in-merge-conflicts.html