Hi,
In order to have a simple Git history and to ease rollbacks I would propose to 
either use “squash and merge” or “rebase and merge” from the GitHub PR UI 
(https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges).
There is already a sentence about this in 
https://jackrabbit.apache.org/oak/docs/participating.html:

"PRs that contain multiple commits in general should be “squashed and merged”.”

However this policy is not always followed like in 
https://github.com/apache/jackrabbit-oak/commit/092a34acf20a8b6adf836285c92212f84c1a90e2
 or 
https://github.com/apache/jackrabbit-oak/commit/b7a9e04d335256a227ebb635072fb6200ea83e35

How about pushing a bit more in that direction by disabling the regular merge 
option via 
https://github.com/apache/infrastructure-asfyaml?tab=readme-ov-file#merge?
WDYT?
Konrad

Reply via email to