Skip to content

Conversation

@cmbarton
Copy link
Contributor

Clarify language about member organization representation in the Members Council. Each organization represented and each individual representative on the Members Council has one vote.

Clarify language about member organization representation in the Members Council. Each organization represented and each individual representative on the Members Council has one vote.
@cmbarton cmbarton added the governance Suggestions for OMF organization and governance label Mar 17, 2022
@alee alee added the Vote Issues or pull requests that can be voted on by voting representatives from the Members Council label Mar 23, 2022
@cmbarton
Copy link
Contributor Author

cmbarton commented May 2, 2022

The charter amendments were approved and need to be merged. Should I (or Allen or Christine) simply click the button to create a merge commit, create a squash and merge (no edits to the commit AFAICT), or rebase and merge (I don't think it is needed).

@alee
Copy link
Member

alee commented May 2, 2022

Merge commits cleanly mark when the charter amendment was merged and I think are preferred in this case with several outstanding pull requests to be merged, sometimes affecting the same files. For example, this PR already has merge conflicts due to direct pushes happening in between: #419

Is there a record of the votes being maintained separately somewhere by @lauraswantek ? That should be transparently recorded somewhere, perhaps https://github.com/openmodelingfoundation/governance ?

@cmbarton
Copy link
Contributor Author

cmbarton commented May 2, 2022

This one should not conflict with #419 because it's a different document in a different section of the site. This one (#415) does modify the same charter document that several other PRs do. But it is a separate section. So should I start with #405 and work up to this one since each one is a separate commit?

Laura has been trying to download the doc with the votes from SalesForce QuestionPro but is having some problems. I agree that https://github.com/openmodelingfoundation/governance is a good place to put it. Maybe we need a subdirectory for amendments?

@alee
Copy link
Member

alee commented May 2, 2022

The issue isn't this PR causing conflicts, #419 already has conflicts that must be resolved before it can be cleanly merged. Scroll down the PR to see this box:

image

I can run the merges and in general I think this should be the responsibility of the CWG (or somewhere in the EC). I don't think going through it in ascending or descending chronological order will make much of a difference, it's likely more important if there are dependencies in the changes (i.e., PR 420 depends on changes incoming in PR 416 but then again it wouldn't make much sense for them to exist independently of each other in the first place).

Just to confirm, all amendments were successfully voted in and approved with no requested changes, right?

Copy link
Member

@alee alee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a fair bit of duplication of content here, perhaps the first two sentences were supposed to be removed? Here's a simplification:

The Members Council reviews and approves OMF policies and modeling standards. It provides advice and support to the Executive Director, Executive Committee, and Working Groups for carrying out governance policies, creating and administering standards, and carrying out other activities. It also facilitates communication between the Open Modeling Foundation and modeling scientists represented by OMF member organizations.

@alee alee merged commit b97abca into develop May 3, 2022
@alee alee deleted the charter-amendment-20220317-5 branch May 3, 2022 00:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

governance Suggestions for OMF organization and governance Vote Issues or pull requests that can be voted on by voting representatives from the Members Council

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants