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.
Suggestion cannot be applied right now. Please check back later.
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.
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
Make manual merge autodetection optional and add manual merge as merge method #12543
Make manual merge autodetection optional and add manual merge as merge method #12543
Changes from 6 commits
6f17944
adab611
52d0a6b
510cc6b
6edd86e
609e9da
0a566a3
fe98c68
e483115
2e71aff
7c97116
ed8f276
c14facd
b958762
c816cc0
9b3d4b2
5d1b12c
2cde228
a9fa07e
a5fcf91
18e8627
7863e53
3fbdb5b
c6864ab
149cc8b
b883e5a
14f7d33
bfcfb44
16ff24f
59f225f
eea1645
f80d860
2abc0d4
c15efe7
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing