Skip to content
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

Jump to bottom

Allow to specify default PR merge option #12293

Closed
MGChecker opened this issue Jul 22, 2020 · 1 comment · Fixed by #14789
Closed

Allow to specify default PR merge option #12293

MGChecker opened this issue Jul 22, 2020 · 1 comment · Fixed by #14789
Labels
type/enhancement An improvement of existing functionality

Comments

@MGChecker
Copy link

Currently, there are four different ways to merge PRs

  • Merge pull request
  • Rebase and merge
  • Rebase and merge (--no-ff)
  • Squash and merge

Usually, the first one in the list which has been activated via repository settings is the default and is achieved when clicking on the big button. I would like to be able to specify the default action for the large button in the repository settings.
@lafriks lafriks added the type/enhancement An improvement of existing functionality label Jul 23, 2020
@lafriks
Copy link
Member

lafriks commented Jul 23, 2020

Usually only one per repo should be used so imho best practice would be to disable all other options in repository settings

@hilariocoelho hilariocoelho mentioned this issue Nov 26, 2020
Closed
parnic added a commit to parnic/gitea that referenced this issue Feb 24, 2021
@parnic
Add DefaultMergeStyle option to repository
1ce4557 
Fixes go-gitea#12293
@parnic parnic mentioned this issue Feb 24, 2021
Merged
6543 pushed a commit that referenced this issue Mar 27, 2021
@parnic
Add DefaultMergeStyle option to repository (#14789)
f4d2749 
Fixes #12293
@go-gitea go-gitea locked and limited conversation to collaborators May 13, 2021
parnic-sks pushed a commit to parnic-sks/gitea that referenced this issue May 18, 2021
@parnic
Add DefaultMergeStyle option to repository (go-gitea#14789)
62e210b 
Fixes go-gitea#12293
parnic-sks pushed a commit to parnic-sks/gitea that referenced this issue Jun 28, 2021
@parnic @parnic-sks
Add DefaultMergeStyle option to repository (go-gitea#14789)
474e956 
Fixes go-gitea#12293
AbdulrhmnGhanem pushed a commit to kitspace/gitea that referenced this issue Aug 10, 2021
@parnic @AbdulrhmnGhanem
Add DefaultMergeStyle option to repository (go-gitea#14789)
b409ace 
Fixes go-gitea#12293
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
type/enhancement An improvement of existing functionality
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Add DefaultMergeStyle option to repository parnic/gitea
2 participants
@lafriks @MGChecker