Skip to content
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 28 commits into from
Dec 2, 2024
Merged

Conversation

live-github-bot[bot]
Copy link
Contributor

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:

  • all CI checks have passed
  • reviews of the code owners impacted by the conflict

⚠️ Warning ⚠️

Warning
Only merge the PR with the option Create a merge commit

live-github-bot bot and others added 28 commits November 26, 2024 13:04
fix: check if returnTo is defined (#8516)

* fix: check if returnTo is defined
* chore: add changeset
* chore: accept suggestion
…8113940019

Smartling on-demand translation delivery from release
@live-github-bot live-github-bot bot requested review from a team as code owners November 29, 2024 14:55
@live-github-bot live-github-bot bot requested review from a team as code owners November 29, 2024 14:55
Copy link

vercel bot commented Nov 29, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
native-ui-storybook ✅ Ready (Inspect) Visit Preview 💬 Add feedback Nov 29, 2024 3:08pm
react-ui-storybook ✅ Ready (Inspect) Visit Preview 💬 Add feedback Nov 29, 2024 3:08pm
web-tools ❌ Failed (Inspect) Nov 29, 2024 3:08pm
1 Skipped Deployment
Name Status Preview Comments Updated (UTC)
ledger-live-github-bot ⬜️ Ignored (Inspect) Visit Preview Nov 29, 2024 3:08pm

@live-github-bot 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
@ledger-wiz-cspm-secret-detection

Wiz Scan Summary

Scanner Findings
Data Finding Sensitive Data 1 Low
Secret Finding Secrets
IaC Misconfiguration IaC Misconfigurations
Total 1 Low

View scan details in Wiz

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
Labels
cli common Has changes in live-common desktop Has changes in LLD ledgerjs Has changes in the ledgerjs open source libs mobile Has changes in LLM translations Translation files have been touched ui Has changes in the design system library
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants