Graphical differences of branches with meld

meld_branches.md

Review code

## set your difftool once:
git config --global diff.tool meld
## then use 
git difftool -d master other_branch
## to see differences

See http://stackoverflow.com/a/2006241/2574238

Make changes permanent (using meld)

git checkout master
git difftool -d other_branch 

Now one can edit the right window. Saved changes are permanent. (see http://stackoverflow.com/a/22535996/2574238)

Review conflicts

git mergetool

I am sorry. I cannot help you here either. I did not use these commands for quitre some time and only posted this here for my personal reference. Maybe try posting on stackoverflow?