slachiewicz commented on PR #12620: URL: https://github.com/apache/maven/pull/12620#issuecomment-5400923347
Rebased onto master and force-pushed to this branch, since it had fallen 59 commits behind and was blocking on conflicts. Only `DefaultModelBuilderTest.java` conflicted, in two places, and both were additive collisions rather than disagreements: - Imports: master added `ModelSource`, this branch added `ModelProblem`. Both kept. - Test methods: master added `testMappedSourcesSupportsConcurrentUpdates` and `testMappedSourcesSuppressesDuplicateSources`, this branch added `defaultSessionModelProblemCollectorIsWritable`, `externalParentProblemsAreRetainedInProjectResult` and `importedBomProblemsAreRetainedInProjectResult`, at the same point. All five kept. Nothing in the 827-line change was reinterpreted. `git range-diff` against the pre-rebase commits reports the second commit identical and the first differing only in surrounding context. Verified: `mvn -pl impl/maven-impl test -Dtest=DefaultModelBuilderTest` → 21 tests, no failures. @wilx your local branch now differs from the remote. `git fetch origin && git reset --hard origin/maven-remember-problems-4x` picks this up; the pre-rebase tip was `567a1a6a7d` if you need to compare or recover. *This comment was created with AI assistance.* -- 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]
