search

appsembler / edx-platform

Appsembler Tahoe fork of Open edX. Branches: `main` for Juniper and `hawthorn/main` for Hawthorn.
https://appsembler.com/products/tahoe/
GNU Affero General Public License v3.0
13 stars 15 forks source link

Update from main (production) #1406

Closed VladyslavTy closed 2 months ago

VladyslavTy commented 2 months ago

Sync production with main branch

github-actions[bot] commented 2 months ago

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?