Skip to content

FINERACT-2177: enforce traditional merge strategy#5663

Open
meonkeys wants to merge 3 commits intoapache:developfrom
meonkeys:enforce-FSIP-7
Open

FINERACT-2177: enforce traditional merge strategy#5663
meonkeys wants to merge 3 commits intoapache:developfrom
meonkeys:enforce-FSIP-7

Conversation

@meonkeys
Copy link
Contributor

@meonkeys meonkeys commented Mar 20, 2026

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!

  • Write the commit message as per our guidelines
  • Acknowledge that we will not review PRs that are not passing the build ("green") - it is your responsibility to get a proposed PR to pass the build, not primarily the project's maintainers.
  • Create/update unit or integration tests for verifying the changes made.
  • Follow our coding conventions.
  • Add required Swagger annotation and update API documentation at fineract-provider/src/main/resources/static/legacy-docs/apiLive.htm with details of any API changes
  • This PR must not be a "code dump". Large changes can be made in a branch, with assistance. Ask for help on the developer mailing list.

@meonkeys meonkeys marked this pull request as ready for review March 20, 2026 18:32
revert FINERACT-2462 / PR apache#5437

resolve FINERACT-2544
Copy link
Contributor

@Aman-Mittal Aman-Mittal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants