codeconsole commented on PR #16769: URL: https://github.com/apache/grails-core/pull/16769#issuecomment-6430871471
The merge is fixed. a0f5c30355 merges 7.0.x in; the conflict was only in `PropertySourcesConfigSpec`, where this PR and #16770 both added features at the end, and both sets are kept. With #16770 in, d74daf3fb9 adds the case that needs both fixes, from @jdaugherty's review of #16770: `merge([grails: ['gorm.url': 'http://${host}']])`. The subscript, `navigate`, `getProperty` and the export of `grails.gorm.url` now read one resolved value, and no `gorm.url` key is written. The new feature fails on 7.0.x. Both modules' suites pass locally. -- 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]
