davsclaus commented on PR #30075:
URL: https://github.com/apache/camel/pull/30075#issuecomment-6902202202

   @Croway this is approved, but it now conflicts with main after #30077 was 
merged. The conflicts are only in generated files:
   
   - 
`catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd`
   - 
`catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd`
   - 
`catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camelYamlDsl-model.json`
   - 
`dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java`
   - 
`dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json`,
 `camelYamlDsl-canonical.json` and `camelYamlDsl-model.json`
   
   Could you rebase onto main and regenerate them, rather than resolving the 
conflicts by hand? Once CI is green again it can be merged.
   
   _Claude Code on behalf of davsclaus_


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to