Move 6.0.0 rc.2 changes#5637
Closed
TravisEz13 wants to merge 2 commits into
PowerShell:6.0.0PowerShell/PowerShell:6.0.0from
TravisEz13:move_6.0.0-rc.2_changesTravisEz13/PowerShell:move_6.0.0-rc.2_changesCopy head branch name to clipboard
Closed
Move 6.0.0 rc.2 changes#5637TravisEz13 wants to merge 2 commits intoPowerShell:6.0.0PowerShell/PowerShell:6.0.0from TravisEz13:move_6.0.0-rc.2_changesTravisEz13/PowerShell:move_6.0.0-rc.2_changesCopy head branch name to clipboard
TravisEz13 wants to merge 2 commits into
PowerShell:6.0.0PowerShell/PowerShell:6.0.0from
TravisEz13:move_6.0.0-rc.2_changesTravisEz13/PowerShell:move_6.0.0-rc.2_changesCopy head branch name to clipboard
Conversation
* remove pester module * restore Pester as a module only in CI build from the git repo * mark appveyor builds as CI builds * remove pester exclusions * mark travis builds as ci * exclude publish folder from spell check * do not run spell check on publish folder # Conflicts: # tools/appveyor.psm1 # tools/travis.ps1
Add --quiet to git checkout which should resolve error message displayed in AppVeyor
Member
Author
|
Bad merge, will resubmit |
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
1 participant
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.
PR Summary
Merge the following PRs to 6.0.0-rc.2:
#5623 Note: merge conflicts had to be resolved due to unmerged changes in:
#5631