Always use merge --no-ff
Use gist-vim and webapi-vim vimscript