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.

Status

TRACKCLOSED

Who is Involved

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

...

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

...

This is effectively a process change, hence, mostly follows the simple/default FSIP pattern.

1. DISCUSS
2. VOTE
3. TRACK (update community, update docs, remind ourselves via dev list, chat, PR comments)
4. CLOSE