chore(repo): Back-merge master into minor (conflicts) - #5062
Closed
github-actions[bot] wants to merge 2 commits into
Closed
chore(repo): Back-merge master into minor (conflicts)#5062github-actions[bot] wants to merge 2 commits into
github-actions[bot] wants to merge 2 commits into
Conversation
Co-authored-by: vendure-ci-automation-bot[bot] <221402278+vendure-ci-automation-bot[bot]@users.noreply.github.com>
|
|
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
Contributor
Author
|
New conflicts detected during back-merge of |
Collaborator
|
Superseded by #5063, which contains the resolved back-merge on the temporary branch. |
Collaborator
|
Superseded by #5063, which contains the resolved back-merge on the temporary backmerge-minor branch. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automatic back-merge of
masterintominorfailed due to merge conflicts.To resolve: check out
minor, mergemaster, resolve the conflicts, and push tominor.git checkout minor git merge origin/master # resolve conflicts git push origin minorNeed help on this PR? Tag
@codesmith-botwith what you need. Autofix is disabled.