Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev: schema tests use src/schemas/validation #4198

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from

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 🫤

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

Successfully merging this pull request may close these issues.

3 participants