According to the discussion above, I think we've agreed that developments beyond the most recent [tagged and deployed version](http://cfconventions.org/documents.html) would take place on master.
I 100% agree that we should consider updating "history" and other common metadata as you say when we cut a release to avoid merge conflicts. I'll add something to this affect unless there is objection? -- You are receiving this because you commented. Reply to this email directly or view it on GitHub: https://github.com/cf-convention/cf-conventions/issues/130#issuecomment-406465997
