Page History

...

When merging a PR into develop (our main integration branch), use a traditional merge commit instead of squashing, rebasing, and fast-forwarding.

Vote passed.Discussion thread

Status

TRACKAccepted. Vote thread. Vote result.

Who is Involved

• Unknown User (meonkeys) (original proposal)
• Krishna Mewara (reviewer)
• Unknown User (adamsaghy) (reviewer)
• james dailey (reviewer)

Background/Motivation

The original motivation was supporting verifiable signed git commits. This was proposed in 2025  and adopted in 2026. Upon investigation, it was determined the current merge strategy (squash, rebase, fast-forward) precludes signed commits except in special situations (done locally or when squash/rebase were unnecessary, e.g. one commit was created and PR was merged before any other commits on develop were added).

...

After a ~one week bake-in period, enforce new strategy with .asf.yaml:

# must be added to existing github section
# (do not create a new one)
github:
  enabled_merge_buttons:
    merge: true
    squash: false
    rebase: false

If adopted, and after another ~week of bake-in, we might make further changes to our .asf.yaml, such as:

github:
  protected  protected_branches:
    develop:
      required_linear_history: false
      required_signatures: true
      required_conversation_resolution: true

...