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

don't report conflicts for releases before nutmeg #1293

Closed OmarIthawi closed 2 years ago

OmarIthawi commented 2 years ago

now we're upgrading to nutmeg, no need to report for older releases

github-actions[bot] commented 2 years ago

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

Comparing with open-release/nutmeg.master
Benchmark conflicts with main 292
Current conflicts 292
Summary Good work! No added conflicts.
Comparing with master
Benchmark conflicts with main 290
Current conflicts 290
Summary Good work! No added conflicts.
coveralls commented 2 years ago

Pull Request Test Coverage Report for Build 3225059447


Files with Coverage Reduction New Missed Lines %
common/lib/xmodule/xmodule/partitions/enrollment_track_partition_generator.py 1 71.43%
lms/djangoapps/course_blocks/transformers/user_partitions.py 1 75.29%
common/djangoapps/util/cache.py 2 68.57%
<!-- Total: 4 -->
Totals Coverage Status
Change from base Build 3198515192: -0.001%
Covered Lines: 110941
Relevant Lines: 226237

💛 - Coveralls