gnodet commented on PR #13114: URL: https://github.com/apache/maven/pull/13114#issuecomment-5664211502
⚠️ **Merge conflict — non-trivial** This branch was created from `master` instead of `maven-3.10.x`, resulting in **5837 commits ahead / 707 behind** the target branch. The merge produces hundreds of conflicts across restructured modules (`maven-model-builder`, `maven-embedder`, `maven-resolver-provider`, etc.). The actual fix is only in 2 commits (`4c8b837` and `a10fb4e`), but they cannot be merged as-is due to the divergent branch base. **Recommended fix:** Close this PR, create a new branch from `maven-3.10.x`, and cherry-pick/adapt the fix commits. _This comment was posted by an automated babysit agent._ -- 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]
