Skip to content

Conversation

jiridanek
Copy link
Owner

No description provided.

Copy link

github-actions bot commented Aug 1, 2025

🔄 Rebase started

Rebasing jiridanek-patch-5 onto main...

Triggered by: @jiridanek

Copy link

github-actions bot commented Aug 1, 2025

Rebase failed!

There are merge conflicts that need to be resolved manually.

Conflicted files:

.github/workflows/piplock-renewal.yaml
Makefile
ci/cached-builds/gen_gha_matrix_jobs.py
ci/cached-builds/makefile_helper.py

Next steps:

  1. Checkout the branch locally: git checkout jiridanek-patch-5
  2. Rebase manually: git rebase main
  3. Resolve conflicts and continue: git rebase --continue
  4. Force push: git push --force-with-lease

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