davsclaus commented on PR #24481: URL: https://github.com/apache/camel/pull/24481#issuecomment-4900640514
I've pushed a merge resolution branch (`resolve-24481`) that resolves the conflict in `Theme.java` caused by PRs #24475 and #24482 landing on `main` after this branch was created. **Resolution summary:** - **Conflict 1** (engine initialization): Uses `mode.id()` from this PR's `ThemeMode` enum, combined with `loadCssResource()` + `addStylesheet()` from main's classloader fix. - **Conflict 2** (loadPersistedMode + loadCssResource): Keeps the `loadCssResource()` method from main and uses `ThemeMode` return type from this PR. The resolution branch compiles and all tests pass. @ammachado please merge `resolve-24481` into your branch, or let me know if you'd prefer a different approach. _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]
