Add DefaultMergeStyle option to repository #14789
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was originally based on the 1.13.2 branch, but it seems this has changed in master
zeripath
approved these changes
Feb 24, 2021
There's no real need for this as the default handles a missing setting.
|
DefaultMergeStyle should be selected on pull request view merge dropdown button. |
@lunny do you mean |
lunny
approved these changes
Mar 4, 2021
lafriks
approved these changes
Mar 7, 2021
|
@parnic Could you resolve the merge conflicts? :) there are already two approvals. |
|
|
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
This pull request adds support for configuring the default merge style for pull requests in a repository.
Fixes #12293
Note: I haven't added tests or anything yet, mostly because I wanted to make sure this was