chore(repo): Back-merge master into minor (conflicts)#4878
Open
github-actions[bot] wants to merge 1 commit into
Open
chore(repo): Back-merge master into minor (conflicts)#4878github-actions[bot] wants to merge 1 commit into
github-actions[bot] wants to merge 1 commit into
Conversation
…4877) Co-authored-by: Michael Bromley <michael@michaelbromley.co.uk>
github-actions
Bot
requested review from
dlhck and
michaelbromley
as code owners
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
michaelbromley
temporarily deployed
to
npm-publish
GitHub Actions
Inactive
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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
/codesmithwith what you need. Autofix is disabled.