ci: bump the github-actions group with 12 updates (#24558) (conflicts) by github-actions[bot] · Pull Request #24658 · coder/coder · GitHub
Skip to content

ci: bump the github-actions group with 12 updates (#24558) (conflicts)#24658

Open
github-actions[bot] wants to merge 1 commit intorelease/2.30from
backport/24558-to-2.30
Open

ci: bump the github-actions group with 12 updates (#24558) (conflicts)#24658
github-actions[bot] wants to merge 1 commit intorelease/2.30from
backport/24558-to-2.30

Conversation

@github-actions
Copy link
Copy Markdown

Backport of #24558

Original PR: #24558 — ci: bump the github-actions group with 12 updates
Merge commit: edd5d83
Requested by: @matifali

Warning

The automatic cherry-pick had conflicts.
Please resolve manually by cherry-picking the original merge commit:

git fetch origin backport/24558-to-2.30
git checkout backport/24558-to-2.30
git reset --hard origin/release/2.30
git cherry-pick -x -m1 edd5d83280809a4c0515428b274ac85eb5ae9f30
# resolve conflicts, then push

The automatic cherry-pick of edd5d83 to release/2.30 had conflicts.
Please cherry-pick manually:

    git cherry-pick -x -m1 edd5d83
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.

1 participant