search

OBF / obf-docs

Official documents of the Open Bioinformatics Foundation
39 stars 20 forks source link

Add 2021-Sept Public Meeting minutes #104

Closed cjfields closed 1 year ago

cjfields commented 2 years ago

This was mistakenly merged in and is now reverted, is now on a branch (#92). I believe we will need to either revert the reversion (:wink) or generate a new pull request to ensure it's included back in.

nlharris commented 2 years ago

Can you do whichever you decide on ASAP, so I can add the link to the meeting agenda? Thanks!

hlapp commented 2 years ago

Based on what I found online there are two ways:

  1. Revert the pull request to revert, which will generate a new pull request.
  2. Create a new branch, cherry pick the commits that were part of the original (and prematurely merged) pull request, then create a new pull request from that.

Either way, the new pull request needs to then be approved by a quorum, and after the motion passes at the Board meeting document this fact and merge.

Option 1 can be operated by clicking, but will result in a reversion of a reversion added to the main branch. Option 2 will result in double-attribution of the originally single-authored commits. I don't have a strong opinion on which one is better.

BTW in case someone is wondering, this cannot be done by rebasing the original branch with the changes onto the current state of master, because the changes from the branch have since been reverted, so it results in a noop. Also, re-merging the original branch looks like a very bad idea based on diff, presumably because of the changes that have happened since.

nlharris commented 2 years ago

Thanks for the research, Hilmar!

I have no opinion about how this is done. Option 1 sounds like it might be more straightforward. Please someone just do whichever is easiest!

cjfields commented 2 years ago

Hi @nlharris @hlapp see #105 , which would effectively add the minutes back once approved.

cjfields commented 2 years ago

Also, @nlharris we could use the link to the original pull request (#92) to this as it has the full list of changes.

hlapp commented 2 years ago

I think we need to use #105 for the minutes. It should in fact have the exact same change set, not sure @cjfields why you think it wouldn't?

cjfields commented 2 years ago

@hlapp I'm fine either way, though much of the discussion re: changes is in the original ticket.

hlapp commented 2 years ago

much of the discussion re: changes is in the original ticket

Good point! That said, I've been assuming that the approval of the minutes will pass with unanimous consent and without discussion. But maybe I'm wrong 🤔😉