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) #1386

Closed github-actions[bot] closed 8 months ago

github-actions[bot] commented 10 months ago

This is an automated pull request to update from branch main

github-actions[bot] commented 9 months ago

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

Comparing with open-release/nutmeg.master
Benchmark conflicts with prod 299
Current conflicts 299
Summary Good work! No added conflicts.
Comparing with master
Benchmark conflicts with prod 319
Current conflicts 318
Summary Resolves 1 existing conflicts. Amazing!
github-actions[bot] commented 8 months ago

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

Comparing with open-release/nutmeg.master
Benchmark conflicts with prod 299
Current conflicts 299
Summary Good work! No added conflicts.
Comparing with master
Benchmark conflicts with prod 319
Current conflicts 318
Summary Resolves 1 existing conflicts. Amazing!