Skip to content

chore(repo): Back-merge master into minor (conflicts) - #5078

Merged
michaelbromley merged 1 commit into
minorfrom
master
Jul 31, 2026
Merged

chore(repo): Back-merge master into minor (conflicts)#5078
michaelbromley merged 1 commit into
minorfrom
master

Conversation

@github-actions

@github-actions github-actions Bot commented Jul 31, 2026 •
edited by blacksmith-sh Bot
Loading

Copy link
Copy Markdown
Contributor

Automatic back-merge of master into minor failed due to merge conflicts.

To resolve: check out minor, merge master, resolve the conflicts, and push to minor.

git checkout minor
git merge origin/master
# resolve conflicts
git push origin minor

Created automatically by the back-merge workflow.

View with [code]smith Autofix with [code]smith
Need help on this PR? Tag @codesmith-bot with what you need. Autofix is disabled.

@vercel

vercel Bot commented Jul 31, 2026 •
edited
Loading

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
vendure-storybook Ready Ready Preview Jul 31, 2026 11:01am

Request Review

@michaelbromley
michaelbromley merged commit d79d2a8 into minor Jul 31, 2026
46 of 48 checks passed
@vendure-ci-automation-bot vendure-ci-automation-bot Bot locked and limited conversation to collaborators Jul 31, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@michaelbromley