Skip to content

Commit

Permalink
Enable plain merge in enabled_merge_buttons
Browse files Browse the repository at this point in the history
In some cases, such as a release version, we will pick some
commits, then do a PR review, and then merge the commits into
the branch. In this case, we want to use plain merge to keep
the info of each commit instead of using squash-merge.

Or in some refactoring PRs, we can separate code moves (rename)
and actual changes into different commits. These single commits
we want to keep the commit message and doing a plain merge.
In this way, when tracking changes, we can only focus on actual
changes without being affected by meaningless diffs.

When enabled, we can control it (when we are doing merge, usually
squash is used, and in some cases we need to keep commits we use merge).
That is, the choice of squash or merge is the responsibility of the
person for merging the PR.

See apache#1622 for more discussion on release part.
  • Loading branch information
enjoy-binbin committed Jul 31, 2023
1 parent 3cfc727 commit f7bd1ae
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .asf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ github:
- redis-cluster
enabled_merge_buttons:
squash: true
merge: false
merge: true
rebase: false
protected_branches:
unstable:
Expand Down

0 comments on commit f7bd1ae

Please sign in to comment.