Merge release/dev17.12 to main #11047
Merged
+0
−0
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
* Replace baseType token with a dedicated type * Track the generic portion of the baseType in the new type * Update the model portion of the baseType when the @model directive is used * Add tests + update baselines. --------- Co-authored-by: Fred Silberberg <[email protected]>
…e/Components/ComponentDocumentClassifierPass.cs Fixup bad merge
Cherry pick two fuse fixes back to 17.12
dotnet-bot
added
area-infrastructure
auto-merge
|
⚠ This PR has merge conflicts. @davidwengier |
|
@chsienki can you double check I merged this correctly? |
chsienki
reviewed
Oct 19, 2024
| @@ -99,7 +99,7 @@ protected override void OnDocumentStructureCreated( | |||
| { | |||
| // We don't want component imports to be considered as real component. | |||
| // But we still want to generate code for it so we can get diagnostics. | |||
| @class.BaseType = new BaseTypeWithModel("object"); | |||
There was a problem hiding this comment.
The original "object" version is actually correct. It was a weird merge back onto 17.12 where both me and Jan had edited the line, but only my change got back ported.
ryzngard
reviewed
Oct 19, 2024
...osoft.CodeAnalysis.Razor.Compiler/src/Language/Components/ComponentDocumentClassifierPass.cs
Outdated
Show resolved
Hide resolved
…e/Components/ComponentDocumentClassifierPass.cs
|
Seems like you two are on top of this :) Thanks! |
chsienki
approved these changes
Oct 21, 2024
This was referenced Oct 24, 2024
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 release/dev17.12 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
Troubleshooting conflicts
Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file containing conflicts copy its path into the following searches:
Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts.
Resolve merge conflicts using your local repo
Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub.
git fetch --all git checkout -t upstream/merges/release/dev17.12-to-main git reset --hard upstream/main git merge upstream/release/dev17.12 # Fix merge conflicts git commit git push upstream merges/release/dev17.12-to-main --force