Skip to content

Conversation

@davidhassell
Copy link
Contributor

Noted that David Hassell is now officially the secretary of the Conventions Committee

davidhassell and others added 30 commits May 3, 2018 08:23
Noted that David Hassell is now officially the secretary of the Conventions Committee
Also David Hassell as Secretary (I'm not sure if a previous pull request worked ...)
…standard name and area type tables and standardized region list.
@ethanrd
Copy link
Member

ethanrd commented Apr 17, 2019

Hi @davidhassell - I have a few more changes to the governance.md file. Since this PR hasn't made it onto the master branch yet, I thought I would add my changes here. However, it looks like other unrelated changes have made there way into this PR. So, I have pulled your governance.md changes and mine into a new branch and made a new PR (#70). Are you OK with closing this PR in favor of the new PR (#70)?

Though, because you are working on your master branch, you may have to use some git magic to get your master branch back in line with origin:master. I think this is one of the reasons standard practice is to always work on a branch, and only make changes to master with pulls from upstream (i.e., origin:master).

Also, its not obvious or intuitive but, once a PR is made, any changes pushed to the PR branch become part of the PR. A really handy feature that allows improvements to be made to a PR with a simple push. However, it does require that each PR branch only contain changes for that PR. (This is how all the changes not dealing with governance.md made there way into this PR.)

@davidhassell
Copy link
Contributor Author

Hi @ethanrd, Thank you for explaining why this is the way it is (it sounds like working in master was my biggest error...). This is an excellent example of why we spell out the practical procedure needed to do this kind of thing!

The main purpose of this one was to introduce the new rules for the CF data model, but I'll redo another one for that, in a branch. I'm am totally fine with your #70, and I'll close this one once I have a new one that I can reference from the data model issue.

@davidhassell
Copy link
Contributor Author

#71 has now been created for the CF data model rules, closing this issue as per precious comments

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants