C'è un conflitto vero e proprio nel yarn.lock che non può essere risolto automaticamente con un merge. Questo succede perché entrambi i branch hanno modificato le stesse righe del lockfile.
Purt…
Aggiornamento di routine del lockfile per @storybook/react-vite da 10.2.17 → 10.2.19. Le modifiche sono interamente in yarn.lock e consistono in:
✅ Merged
CI was passing. This PR has been merged and the branch deleted as requested.
✅ Merged
CI was passing. This PR has been merged and the branch deleted as requested.
✅ Merged
CI was passing. This PR has been merged and the branch deleted as requested.
✅ Merged
CI was passing. This PR has been merged and the branch deleted as requested.
✅ Merged
CI was passing. This PR has been merged and the branch deleted as requested.
✅ Merged
CI was passing. This PR has been merged and the branch deleted as requested.
✅ Merged
CI was passing. This PR has been merged and the branch deleted as requested.
⚠️ Merge Failed — Server Error
CI was passing for this PR, but the Gitea API returned a persistent 405 – Please try again later error when attempting to merge. The branch has not…
ee3bdad9ad
Merge pull request 'chore(deps): update dependency @vitejs/plugin-react to v5.2.0' (#39) from renovate/vitejs-plugin-react-5.x-lockfile into main
❌ CI Failing — Not Merged
CI check continuous-integration/drone/pr is failing for this PR. It has not been merged.
Please investigate the [build failure](https://drone.beatrice.wtf…
99e7ffa5a4
Merge pull request 'chore(deps): update dependency @storybook/addon-themes to v10.2.19' (#34) from renovate/storybook-addon-themes-10.x-lockfile into main
❌ CI Failing — Not Merged
CI check continuous-integration/drone/pr is failing for this PR. It has not been merged.
Please investigate the [build failure](https://drone.beatrice.wtf…
58358d3033
Merge pull request 'chore(deps): update dependency @storybook/react to v10.2.19' (#35) from renovate/storybook-react-10.x-lockfile into main