-
Notifications
You must be signed in to change notification settings - Fork 905
Merge release/2.2 into master #2043
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
Conversation
Co-authored-by: Ahmad Shah <[email protected]>
…2.1-1746482425951 Merge release/2.0 into release/2.1
…2.2-1746485012973 Merge release/2.1 into release/2.2
API Change ReportNo changes found! |
We don't traditionally update master with patch version. |
Pull request was closed
10f57ab
to
f42e076
Compare
There is an existing patch(es) for this commit SHA: Please note that the status that is posted is not in the context of this PR but rather the (latest) existing patch and that may affect some tests that may depend on the particular PR. If your tests do not rely on any PR-specific values (like base or head branch name) then your tests will report the same status. If you would like a patch to run in the context of this PR and abort the other(s), comment 'evergreen retry'. |
Manually excluded the bump commit to ensure release/2.2 is fully merged into master. I'll create a separate PR to mark the bump commit as merged without applying changes. |
Merge new changes from release/2.2 into master.
Commits
To resolve any conflicts, check out the temporary branch and run the following command:Resolving conflicts
To ignore from the remote branch, first reset the temporary branch to master and manually merge using the `ours` merge strategy:Ignoring changes
Then, push the temporary branch to upate the pull request.