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

chore: Update refit to 7.2.22 (backport #2611) #2616

Merged
merged 4 commits into from
Nov 18, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 18, 2024


This is an automatic backport of pull request #2611 done by [Mergify](https://mergify.com).

jeromelaban and others added 3 commits November 18, 2024 12:25
(cherry picked from commit d545070)

# Conflicts:
#	src/Directory.Packages.props
@mergify mergify bot added the conflicts label Nov 18, 2024
Copy link
Author

mergify bot commented Nov 18, 2024

Cherry-pick of d545070 has failed:

On branch mergify/bp/release/stable/5.1/pr-2611
Your branch is up to date with 'origin/release/stable/5.1'.

You are currently cherry-picking commit d5450700b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   samples/Playground/Directory.Packages.props
	modified:   testing/TestHarness/Directory.Packages.props

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/Directory.Packages.props

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Nov 18, 2024
@eriklimakc eriklimakc self-assigned this Nov 18, 2024
@kazo0 kazo0 enabled auto-merge November 18, 2024 13:42
@kazo0 kazo0 merged commit e5c840b into release/stable/5.1 Nov 18, 2024
12 checks passed
@kazo0 kazo0 deleted the mergify/bp/release/stable/5.1/pr-2611 branch November 18, 2024 14:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants