Branches

Merging

To merge a branch to master

$ git checkout master

$ git merge _BRANCH_NAME_

Then you can delete the merged branch with the command

$ git branch -d _BRANCH_NAME_

To use a graphical tool to resolve merging issues

$ git mergetool

To get a simple listing of your current branches

$ git branch

To see the last commit on each branch

$ git branch -v

To delete a remote branch

$ git push origin --delete _BRANCH_NAME_