When there\'s a collison during git merge, I open a mergetool called Meld. It opens three files LOCAL, BASE and REMOTE. As I\'ve read LOCAL is my local branch,
git merge
Cosmin's solution works, but the $BASE file is updated--not $MERGED. This will update the $MERGED file:
Meld: v1.8.4
v1.8.4
[merge] conflictstyle = diff3 tool = mymeld [mergetool "mymeld"] cmd = meld --auto-merge --output $MERGED $LOCAL $BASE $REMOTE --diff $BASE $LOCAL --diff $BASE $REMOTE