templates / remotes--on commit revert/cherry-pick: use aggressive merge. (d180285)
   1: this is just to ensure the directory exists.