This repository was archived by the owner on Apr 20, 2023. It is now read-only.
Merge rel/1.1.0 to release/2.0.0#7073
Merged
livarcocc merged 10 commits intorelease/2.0.0from Jul 5, 2017
Merged
Conversation
This SDK contains the F# targets.
…eTemplateEngineFor1x Mlorbetske dev/mlorbe/update template engine for1x
Publishing a 'coherent' badge.
…-to-release/2.0.0-20170705-070026 * dotnet/rel/1.1.0: Copy Paste error chmod .sh files Update the SDK to 1.1.0-alpha-20170630-2 Update Template Engine and templates for 1.x
|
@dotnet-bot Test Debian8.2 x64 Debug Build |
livarcocc
approved these changes
Jul 5, 2017
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 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.
This is an automatically generated pull request from rel/1.1.0 into release/2.0.0.
git fetch --all git checkout merges/rel/1.1.0-to-release/2.0.0-20170705-070026 git reset --hard upstream/release/2.0.0 git merge upstream/rel/1.1.0 # Fix merge conflicts git commit git push merges/rel/1.1.0-to-release/2.0.0-20170705-070026 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.