Merge release/dev16.6 to release/dev16.7-preview1#43875
Merged
10 commits merged intorelease/dev16.7-preview1from May 2, 2020
Merged
Merge release/dev16.6 to release/dev16.7-preview1#4387510 commits merged intorelease/dev16.7-preview1from
10 commits merged intorelease/dev16.7-preview1from
Conversation
This now correctly handles a file being removed and added a second time, and also a file being removed if there was no dynamic file provided originally. This also adds locks around the operations to ensure there aren't trivial races. Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1107122
…tions Fix a bunch of bugs around dynamic files being added and removed
105f202 to
abe878f
Compare
This pull request was closed.
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
3 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 release/dev16.6 into release/dev16.7-preview1.
git fetch --all git checkout merges/release/dev16.6-to-release/dev16.7-preview1 git reset --hard upstream/release/dev16.7-preview1 git merge upstream/release/dev16.6 # Fix merge conflicts git commit git push upstream merges/release/dev16.6-to-release/dev16.7-preview1 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.