Merge remote-tracking branch 'upstream/stable' into merge_stable#4889
Merged
MartinNowak merged 11 commits intodlang:masterfrom Nov 20, 2016
Merged
Merge remote-tracking branch 'upstream/stable' into merge_stable#4889MartinNowak merged 11 commits intodlang:masterfrom
MartinNowak merged 11 commits intodlang:masterfrom
Conversation
This reverts commit 1fc5f9b.
- workaround scope escape error to get default parameter - would require a working `return scope` for a proper implementation
reduce test template bloat
fix Issue 16582 - ParameterDefaults fails w/ scope parameter
Also put the signature of `isImplicitlyConvertible` in a comment to make the example more clear.
Revert dlang#4273 + add test
❗️❗️❗️Implicit cast to const slices in case of underlaying range is a pointer.
Resurrect ApplyLeft and ApplyRight's documentation
Conflicts:
std/traits.d
Contributor
Member
Author
|
Why is this stuck? |
Member
|
@MartinNowak Looks fine, what does the "conflicts" comment at the top mean? |
schveiguy
approved these changes
Nov 11, 2016
Member
Author
If you merge on the command line, that's the commit message git creates when merge conflicts occur. |
Member
|
@MartinNowak so what do we do here? Should I just merge? |
Member
Author
|
Yes, I'll just merge it. The resolution of the merge conflict is part of the merge commit (as always), the conflict comment is just a git remark for the history. |
Member
Author
|
Auto-merge toggled on |
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
9 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.
Conflicts:
std/traits.d