Skip to content
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

Merge master to feature/ext #8988

Merged
merged 2 commits into from
Apr 18, 2020
Merged

Conversation

dotnet-bot
Copy link
Contributor

This is an automatically generated pull request from master into feature/ext.

git fetch --all
git checkout merges/master-to-feature/ext
git reset --hard upstream/feature/ext
git merge upstream/master
# Fix merge conflicts
git commit
git push upstream merges/master-to-feature/ext --force

Once all conflicts are resolved and all the tests pass, you are free to merge the pull request.

dotnet-maestro bot and others added 2 commits April 17, 2020 12:02
…415.5

- Microsoft.DotNet.Arcade.Sdk: 1.0.0-beta.20213.4 -> 1.0.0-beta.20215.5
…781-ca155a04c223

[master] Update dependencies from dotnet/arcade
@KevinRansom KevinRansom merged commit 238c534 into feature/ext Apr 18, 2020
@dotnet-bot dotnet-bot deleted the merges/master-to-feature/ext branch April 18, 2020 06:04
@dotnet-bot dotnet-bot restored the merges/master-to-feature/ext branch April 18, 2020 09:03
@dotnet-bot dotnet-bot deleted the merges/master-to-feature/ext branch April 18, 2020 09:03
@dotnet-bot dotnet-bot restored the merges/master-to-feature/ext branch April 18, 2020 12:03
@dotnet-bot dotnet-bot deleted the merges/master-to-feature/ext branch April 18, 2020 12:03
@dotnet-bot dotnet-bot restored the merges/master-to-feature/ext branch April 18, 2020 15:03
@dotnet-bot dotnet-bot deleted the merges/master-to-feature/ext branch April 18, 2020 15:03
@dotnet-bot dotnet-bot restored the merges/master-to-feature/ext branch April 18, 2020 18:03
@dotnet-bot dotnet-bot deleted the merges/master-to-feature/ext branch April 18, 2020 18:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants