🚨 Release merge conflicts #8971
Open
+3,961
−1,921
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
![live-github-bot[bot]](https://avatars.githubusercontent.com/in/198164?s=60&v=4){kind=small}
* fix(dot): defined dedicated function for serialized parameters for swap Signed-off-by: Stéphane Prohaszka <[email protected]> * chore: add changeset-s --------- Signed-off-by: Stéphane Prohaszka <[email protected]>
fix: double broadcast on exchange flow [LIVE-15840]
* File apps/ledger-live-desktop/static/i18n/en/app.json was translated to ar-AE locale * File apps/ledger-live-desktop/static/i18n/en/app.json was translated to zh-CN locale * File apps/ledger-live-desktop/static/i18n/en/app.json was translated to fr-FR locale * File apps/ledger-live-desktop/static/i18n/en/app.json was translated to de-DE locale * File apps/ledger-live-desktop/static/i18n/en/app.json was translated to ja-JP locale * File apps/ledger-live-desktop/static/i18n/en/app.json was translated to ko-KR locale * File apps/ledger-live-desktop/static/i18n/en/app.json was translated to pt-BR locale * File apps/ledger-live-desktop/static/i18n/en/app.json was translated to ru-RU locale * File apps/ledger-live-desktop/static/i18n/en/app.json was translated to es-ES locale * File apps/ledger-live-desktop/static/i18n/en/app.json was translated to tr-TR locale * File apps/ledger-live-mobile/src/locales/en/common.json was translated to ar-AE locale * File apps/ledger-live-mobile/src/locales/en/common.json was translated to zh-CN locale * File apps/ledger-live-mobile/src/locales/en/common.json was translated to fr-FR locale * File apps/ledger-live-mobile/src/locales/en/common.json was translated to de-DE locale * File apps/ledger-live-mobile/src/locales/en/common.json was translated to ja-JP locale * File apps/ledger-live-mobile/src/locales/en/common.json was translated to ko-KR locale * File apps/ledger-live-mobile/src/locales/en/common.json was translated to pt-BR locale * File apps/ledger-live-mobile/src/locales/en/common.json was translated to ru-RU locale * File apps/ledger-live-mobile/src/locales/en/common.json was translated to es-ES locale * File apps/ledger-live-mobile/src/locales/en/common.json was translated to tr-TR locale --------- Co-authored-by: smartling-github-connector[bot] <165276057+smartling-github-connector[bot]@users.noreply.github.com>
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
1 Skipped Deployment
|
live-github-bot
bot
added
desktop
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 developChecklist
To be ready to be merged, we must comply with all theses checks: