Merge dev15.6.x to dev15.7.x #25613
Merged
Merge dev15.6.x to dev15.7.x #25613
Conversation
This file contains 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
This moves all of our build diagnistic output into the same folder: Binaries\Configuration\Logs. Having it in a single folder is necessary for us to upload the information using the VSTS Build Artifact task. Jenkins should be unaffected. It supports and uses wildcards for the file types we need to be uploaded on failed builds.
Move all build diagnostic info into Logs dir
|
I will handle this merge conflict. |
jaredpar
force-pushed
the
merges/dev15.6.x-to-dev15.7.x
branch
from
1cc5785 to
4bb31de
Compare
jaredpar
force-pushed
the
merges/dev15.6.x-to-dev15.7.x
branch
from
4bb31de to
878f075
Compare
jaredpar
approved these changes
Mar 20, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 dev15.6.x into dev15.7.x.
git fetch --all git checkout merges/dev15.6.x-to-dev15.7.x git reset --hard upstream/dev15.7.x git merge upstream/dev15.6.x # Fix merge conflicts git commit git push merges/dev15.6.x-to-dev15.7.x --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.