Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main to release/dev17.4 #13499

Merged
merged 13 commits into from
Jul 12, 2022

Conversation

dotnet-bot
Copy link
Contributor

This is an automatically generated pull request from main into release/dev17.4.

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/main-to-release/dev17.4
git reset --hard upstream/release/dev17.4
git merge upstream/main
# Fix merge conflicts
git commit
git push upstream merges/main-to-release/dev17.4 --force

dsyme and others added 12 commits July 11, 2022 16:57
* add identifier analysis script

* add identifier analysis script
…13432)

* Allow lower-case DU cases when RequireQualifiedAccess is specified

* Fix PR suggestions and Add more testing

* Protect feature under preview version

* Add a NotUpperCaseConstructorWithoutRQA warning to be raised in lang version preview

* Fix formatting
* normalize some names

* format code

* fix build
…ator invocations and QuotationToExpression (#11681)

Co-authored-by: Vlad Zarytovskii <[email protected]>
Co-authored-by: Don Syme <[email protected]>
@vzarytovskii vzarytovskii disabled auto-merge July 12, 2022 21:06
@vzarytovskii vzarytovskii enabled auto-merge (squash) July 12, 2022 21:06
@vzarytovskii vzarytovskii merged commit 873eefc into release/dev17.4 Jul 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants