Skip to content

Conversation

ralfhandl
Copy link
Contributor

Run schema tests with current work-in-progress schema in src/schemas/validation folder

@handrews
Copy link
Member

I would prefer to merge rather than cherry-pick. The branches haven't diverged yet so a bit of merging back and forth while we learn our new process doesn't seem like a bad thing. Sub-optimal, but we'll all likely do a few sub-optimal things while learning!

If you feel strongly that cherry-pick is better, I'm open to understanding that position. I'd like for us to have a clear policy on when we use different git functions rather than doing it ad-hoc.

@lornajane
Copy link
Contributor

I feel strongly that cherry pick is better for a use case where we do want to make the same change to more than one v*-dev branch because otherwise we'll merge too many things between branches when they diverge more and it'll be chaotic. There's definitely an alternative where we make a second pull request with a different base but I vote for a change in one place, and a cherry pick to the other branch that needs it. If that makes sense then I totally agree that one of us should write that down!

@ralfhandl
Copy link
Contributor Author

ralfhandl commented Nov 14, 2024

Yes, please, let's document the preferred processes!

The branches haven't diverged yet

Except for src/oas.md 🫤

@ralfhandl ralfhandl added the Schema changes related to the schema(s) label Nov 14, 2024
@handrews handrews merged commit 165a5a4 into OAI:dev Nov 21, 2024
2 checks passed
@ralfhandl ralfhandl deleted the dev-schema-tests branch November 21, 2024 13:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Housekeeping Schema changes related to the schema(s)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants