Branching and Merging

Creating a branch:

git checkout -b branch-name

OR

git branch branch-name
git checkout branch-name

Example:

$ git branch rm123
$ git checkout rm123

Merging a branch:

$ git checkout master
$ git merge rm123