FINERACT-2177: enforce traditional merge strategy#5663
Open
meonkeys wants to merge 3 commits intoapache:developfrom
Open
FINERACT-2177: enforce traditional merge strategy#5663meonkeys wants to merge 3 commits intoapache:developfrom
meonkeys wants to merge 3 commits intoapache:developfrom
Conversation
35772dc to
71fa782
Compare
revert FINERACT-2462 / PR apache#5437 resolve FINERACT-2544
71fa782 to
76a8e5a
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PLEASE REVIEW BUT DO NOT MERGE YET
Per FSIP-7, please do not merge until Monday, March 23rd, 2026
Description
FINERACT-2177
Enforce new policy from FSIP-7.
In order to preserve commit signatures in git commit history (and with the added benefit of additional provenance), we had to change our merge stragegy so, when merging PRs into develop, we do not also clobber signatures.
Checklist
Please make sure these boxes are checked before submitting your pull request - thanks!