templates / branches--on commit rerere: handle conflicts with multiple stage #1 entries (5eda906)
   1: this is just to ensure the directory exists.