Merge git branches without requiring input
Set Atom as the default editor