templates / branches--on commit apply: check D/F conflicts more carefully. (c28c571)
   1: this is just to ensure the directory exists.