Skip to content

FINERACT-2544: update merge strategy guidance for FSIP-7 #5644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mansi75 wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

FINERACT-2544: update merge strategy guidance for FSIP-7 #5644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
906a5ce
FINERACT-2544: update merge strategy guidance for FSIP-7
mansi75 Mar 18, 2026
420fe04
FINERACT-2544: remove trailing whitespace from CONTRIBUTING.md
mansi75 Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 0 additions & 57 deletions .github/workflows/pr-one-commit-per-user-check.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ We have an automated bot which marks pull requests as "stale" after a while, and

This project's committers typically prefer to bring your pull requests in through _Rebase and Merge_ instead of _Create a Merge Commit_. (If you are unfamiliar with GitHub's UI regarding this, note the somewhat hidden little triangle drop-down at the bottom of the PR, visible only to committers, not contributors.) This avoids the "merge commits" which we consider to be somewhat "polluting" the project's commit log history view. We understand this doesn't give an easy automatic reference to the original PR (which GitHub automatically adds to the merge commit message it generates), but we consider this an only very minor inconvenience; it's typically relatively easy to find the original PR even just from the commit message, and JIRA.

We expect most proposed PRs to typically consist of a single commit. Committers may use _Squash and merge_ to combine your commits at merge time, and if they do so, will rewrite your commit message as they see fit.
Contributors may include multiple commits in a PR. There is no longer a one-commit-per-user expectation. Authors are encouraged to organize commits in a way that best communicates the development and review history of the change. Keeping commits logical and reviewable is preferred, but preserving intermediate work, follow-up fixes, and signed commits is fully acceptable.

Neither of these two are hard absolute rules, but mere conventions. Multiple commits in single PRs make sense in certain cases (e.g. branch backports).

Expand Down
Loading