Add Git merge

Adds git merge option to the `git context menu`.

This will allow user to select a branch (remote or local) to be merged into the current branch.

Any merges with conflicts will be reported as a `git merge error` currently. [Upcoming conflict resolution UI]

@devoncarew 
remove these commented out lines?