Merged
Conversation
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
3 Skipped Deployments
|
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. |
kallen-ledger
force-pushed
the
support/release-merge-conflicts
branch
from
715a369 to
9958fd9
Compare
kallen-ledger
previously approved these changes
Dec 16, 2024
Justkant
previously approved these changes
Dec 16, 2024
KVNLS
previously approved these changes
Dec 16, 2024
jiyuzhuang
previously approved these changes
Dec 16, 2024
kallen-ledger
force-pushed
the
support/release-merge-conflicts
branch
from
9958fd9 to
a217cf5
Compare
kallen-ledger
dismissed stale reviews from Justkant and jiyuzhuang
via
c3ab6a1
…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
kallen-ledger
force-pushed
the
support/release-merge-conflicts
branch
from
c3ab6a1 to
c2dc417
Compare
kallen-ledger
force-pushed
the
support/release-merge-conflicts
branch
from
c2dc417 to
4b73a03
Compare
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
7 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.
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: