horray
Merge remote branch 'origin/master' into HEAD
Merge branch 'new_branch_name'
Be more resilient against missing files