Skip to content

Release 12.0.0 #544

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

Open
wants to merge 1,124 commits into
base: master
Choose a base branch
from
Open

Release 12.0.0 #544

wants to merge 1,124 commits into from

Conversation

SameeraPriyathamTadikonda
Copy link
Contributor

No description provided.

builder and others added 30 commits December 3, 2024 00:26
@SameeraPriyathamTadikonda SameeraPriyathamTadikonda requested review from abika5 and yunzvanessa and removed request for abika5 July 29, 2025 23:07
@SameeraPriyathamTadikonda
Copy link
Contributor Author

@abika5 / @yunzvanessa / @DarrenJAN Please look into the merge conflicts and merge the PR to master branch.

@yunzvanessa
Copy link
Contributor

Hi @SameeraPriyathamTadikonda,

I can't resolve conflicts on the UI since the conflicts is too big, but I briefly went over the changed files and they look correct to me. I think you can resolve the conflicts through command line. For all merge conflicts, use the version from release-12.0.0

@yunzvanessa yunzvanessa requested review from abika5 and DarrenJAN July 30, 2025 01:01
@SameeraPriyathamTadikonda
Copy link
Contributor Author

Hi @SameeraPriyathamTadikonda,

I can't resolve conflicts on the UI since the conflicts is too big, but I briefly went over the changed files and they look correct to me. I think you can resolve the conflicts through command line. For all merge conflicts, use the version from release-12.0.0

Hi @yunzvanessa ,
Since DevOps doesn’t work directly with the application code, we prefer that merge conflicts be resolved by the developers who are more familiar with the changes. This helps ensure nothing critical is missed during the merge. Let me know if you need any help coordinating or reviewing the PR once it's ready.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants