templates / branches--on commit Use merge-recursive in git-checkout -m (branch switching) (c1a4278)
   1: this is just to ensure the directory exists.