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.

Sign up for GitHub

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

Jump to bottom

Update from main (production) #1406

Merged
merged 8 commits into from
Jul 17, 2024
Merged

Update from main (production) #1406

merged 8 commits into from
Jul 17, 2024

Conversation

VladyslavTy
Copy link

Sync production with main branch

@github-actions GitHub Actions
Copy link

Checking git merge conflicts against https://github.com/openedx/edx-platform.git

Comparing with open-release/nutmeg.master
Benchmark conflicts with prod 299
Current conflicts 301
Summary Adds 2 new conflicts. How can we do better?
Comparing with master
Benchmark conflicts with prod 329
Current conflicts 331
Summary Adds 2 new conflicts. How can we do better?

@VladyslavTy VladyslavTy merged commit 5609a73 into prod Jul 17, 2024
22 of 24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@daniilly daniilly daniilly approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@VladyslavTy @daniilly @amirtds