Turn off merge with bare in normal merge mode#706
Merged
shijinglu merged 1 commit intotwosigma:masterfrom May 22, 2019
Merged
Conversation
Contributor
|
why? |
Collaborator
Author
Merge has three modes, Because the |
Contributor
|
Can we just fix #707?
…On May 22, 2019 1:57:09 PM EDT, shijing ***@***.***> wrote:
> why?
Merge has three modes, `ALLOW_BARE`, `FORCE_OPEN` and `FORCE_BARE`
respectfully. `FORCE_OPEN` behaves exactly the same as the old normal
merge. `FORCE_BARE` also behaves as expected and has been tested under
different scenarios. `ALLOW_BARE` however this option has a bug:
#707
Because the `ALLOW_BARE` option is only accessible from normal merge. I
want to turn it off and turn it back on when the bug is fixed.
--
You are receiving this because you commented.
Reply to this email directly or view it on GitHub:
#706 (comment)
--
Sent from my Android device with K-9 Mail. Please excuse my brevity.
|
Collaborator
Author
novalis
approved these changes
May 22, 2019
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Previously we turned on merge with half-open repo by default. Now we change the default option to always open subrepos.