-
Notifications
You must be signed in to change notification settings - Fork 350
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
🚨 Release merge conflicts #8546
Merged
Merged
Conversation
This file contains 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
fix: check if returnTo is defined (#8516) * fix: check if returnTo is defined * chore: add changeset * chore: accept suggestion
…d to ar-AE locale
…d to zh-CN locale
…d to fr-FR locale
…d to de-DE locale
…d to ja-JP locale
…d to ko-KR locale
…d to pt-BR locale
…d to ru-RU locale
…d to es-ES locale
…d to tr-TR locale
…8113940019 Smartling on-demand translation delivery from release
The latest updates on your projects. Learn more about Vercel for Git ↗︎
1 Skipped Deployment
|
live-github-bot
bot
added
desktop
Has changes in LLD
mobile
Has changes in LLM
common
Has changes in live-common
ui
Has changes in the design system library
ledgerjs
Has changes in the ledgerjs open source libs
translations
Translation files have been touched
cli
labels
Nov 29, 2024
Wiz Scan Summary
To detect these findings earlier in the dev lifecycle, try using Wiz Code VS Code Extension. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The release had some merge conflicts 🚨
This pull request was created in order to resolve the merge conflicts between the release and develop branches.
git checkout develop && git pull git checkout support/release-merge-conflicts git merge develop
Checklist
To be ready to be merged, we must comply with all theses checks: