Skip to content

Conversation

@fballiano
Copy link
Contributor

No description provided.

@fballiano fballiano requested a review from a team as a code owner October 14, 2025 15:36
rhoerr
rhoerr previously approved these changes Oct 14, 2025
@fballiano
Copy link
Contributor Author

wait, the jsons should already be there, why are they not marked as conflicting

@fballiano
Copy link
Contributor Author

@rhoerr ok this PR should be clean now

@fballiano fballiano merged commit f1ddce8 into mage-os:main Oct 14, 2025
1 check passed
@fballiano fballiano deleted the 248p3 branch October 14, 2025 15:42
@rhoerr
Copy link
Contributor

rhoerr commented Oct 14, 2025

I think that happened because the source branch is the same as #254 and you haven't merged the latest main back in -- maybe worsened if 254 was squashed so the commits don't line up

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.

2 participants