зеркало из https://github.com/dotnet/razor.git
Merge release/dev17.9 to main (#9662)
This is an automatically generated pull request from release/dev17.9 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: - https://github.com/dotnet/razor/find/release/dev17.9 - https://github.com/dotnet/razor/find/main 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. ``` bash git fetch --all git checkout -t upstream/merges/release/dev17.9-to-main git reset --hard upstream/main git merge upstream/release/dev17.9 # Fix merge conflicts git commit git push upstream merges/release/dev17.9-to-main --force ```
This commit is contained in:
dotnet bot
GitHub
Коммит
96a1ad3afc