Skip to content

[improve][misc] Enable rebase and merge to handle one PR of multiple semantic commits #20325

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

Merged
tisonkun merged 1 commit into from
May 15, 2023
Merged

[improve][misc] Enable rebase and merge to handle one PR of multiple semantic commits #20325

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions .asf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,9 @@ github:
# Enable projects for project management boards
projects: true
enabled_merge_buttons:
# enable squash button:
squash: true
# disable merge button:
merge: false
# disable rebase button:
rebase: false
rebase: true
Copy link
Copy Markdown
Member

@michaeljmarshall michaeljmarshall May 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might help to provide committers with documentation on when to use which button. We haven't had the option previously, so this might confuse some. I hope we don't get any committers arguing for a force push update to master to change the history because they hit the wrong button.

Copy link
Copy Markdown
Member Author

@tisonkun tisonkun May 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK. Let me start a mail thread first.

For documentation, I don't think committers read comments in .asf.yaml so probably a page under https://pulsar.apache.org/contribute/develop-coding-conventions/ said "Reviewing Pull Request" or "Merging Pull Request".

Copy link
Copy Markdown
Member

@michaeljmarshall michaeljmarshall May 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @tisonkun. I agree with putting it in that section. A committer guide would be valuable--I don't think we have one though.

protected_branches:
master:
required_status_checks:
Expand Down