search

dotnet / ef6

This is the codebase for Entity Framework 6 (previously maintained at https://entityframework.codeplex.com). Entity Framework Core is maintained at https://github.com/dotnet/efcore.
https://docs.microsoft.com/ef/ef6
MIT License
1.41k stars 538 forks source link

[automated] Merge branch 'release/6.4' => 'main' #2222

Closed dotnet-maestro-bot closed 3 months ago

dotnet-maestro-bot commented 3 months ago

I detected changes in the release/6.4 branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.

This PR merges commits made on release/6.4 by the following committers:

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/6.4
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/6.4

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/EntityFramework6 HEAD:merge/release/6.4-to-main
or if you are using SSH ``` git push git@github.com:dotnet-maestro-bot/EntityFramework6 HEAD:merge/release/6.4-to-main ```

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

:warning: If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/6.4-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/6.4-to-main main
git pull https://github.com/dotnet-maestro-bot/EntityFramework6 merge/release/6.4-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/EntityFramework6 HEAD:merge/release/6.4-to-main
or if you are using SSH ``` git checkout -b merge/release/6.4-to-main main git pull git@github.com:dotnet-maestro-bot/EntityFramework6 merge/release/6.4-to-main (make changes) git commit -m "Updated PR with my changes" git push git@github.com:dotnet-maestro-bot/EntityFramework6 HEAD:merge/release/6.4-to-main ```

Contact .NET Core Engineering if you have questions or issues. Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

AndriySvyryd commented 3 months ago

Superseded by #2223