tuxji commented on PR #768: URL: https://github.com/apache/daffodil/pull/768#issuecomment-1095024598
Hi @alexanderrevello, somehow you've merged two new commits from the main branch into your pull request which are now causing two conflicting files: ```text daffodil-cli/bin.LICENSE daffodil-cli/bin.NOTICE ``` from these commits: • [97992f6](https://github.com/apache/daffodil/commit/97992f6322e84b023cde5eee8d15338dd6a983f1) Update copyright year to 2022 • [e9e3703](https://github.com/apache/daffodil/commit/e9e37038fdb372b68873ee5f50aa4598061b310c) Refresh bin.NOTICE and improve bin.LICENSE I did review your other actual (new) commits, • [f1f1ac6](https://github.com/apache/daffodil/commit/f1f1ac636860ff0052f12c97c7b7b5275a6638c1) requested changes including new naming structure, making name not be passed where it isn't needed and comment fixes • [1cc18db](https://github.com/apache/daffodil/commit/1cc18db27e0fd42bd974240bf1c1fc57342989ab) removed factory misdirection, BitsCharsetDefinitionRegistry.find returns Aside from requesting that the charsets in daffodil-io/src/main/resources/META-INF/services/org.apache.daffodil.processors.charset.BitsCharsetDefinition be sorted alphabetically, I think your actual changes look good. If @stevedlawrence agrees, I propose that you make that additional change, rebase and squash your pull request so that these conflicting files go away, we let CI run its tests, and we take one last look before we approve and merge your pull request. Thanks for seeing this PR through! -- 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]
