fix(@angular-devkit/schematics): Fix merge that causes an overwrite #19878
Conversation
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
Brocco
commented
Jan 26, 2021
alan-agius4
reviewed
Jan 26, 2021
Brocco
force-pushed
the
schematic-overwrite-fix
branch
2 times, most recently
from
694e312 to
b10d482
Compare
clydin
requested changes
Jan 26, 2021
Brocco
force-pushed
the
schematic-overwrite-fix
branch
3 times, most recently
from
0f39a57 to
df6dd97
Compare
clydin
reviewed
Jan 27, 2021
Brocco
force-pushed
the
schematic-overwrite-fix
branch
2 times, most recently
from
8bf63b6 to
21f15fc
Compare
clydin
reviewed
Jan 27, 2021
tests/legacy-cli/e2e/tests/generate/component/component-duplicate.ts
Outdated
Show resolved
Hide resolved
This fixes angular#11337 to allow for merging of a tree with another when the the file already exists in the tree being merged into.
Brocco
force-pushed
the
schematic-overwrite-fix
branch
from
21f15fc to
39e584f
Compare
clydin
approved these changes
Jan 27, 2021
|
This issue has been automatically locked due to inactivity. Read more about our automatic conversation locking policy. This action has been performed automatically by a bot. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 fixes #11337 to allow for merging of a tree with another when the the file already exists in the tree being merged into.