dsmiley opened a new pull request, #5021:
URL: https://github.com/apache/solr/pull/5021
… major branch
logchange.py forward-port failed releasing 9.11.0: it tried to cherry-pick
9.x feature commits onto branch_10x and main.
* Only cherry-pick commits touching changelog/v{version}/. Selecting
everything under changelog/ picked up every feature commit with a changelog
entry since the release branch diverged from the target.
* Pull each target branch (fast-forward only) before cherry-picking, so the
final push isn't rejected.
* Resolve modify/delete conflicts confined to changelog/unreleased/ by
removing the entry; -X ours doesn't settle those. Skip a pick that is already
applied.
* Discard other versions' regenerated version-summary.md files, which
otherwise block the next checkout.
Co-Authored-By: Claude Opus 5.5 <[email protected]>
--
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]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
