Cannot merge Sweekt distribution changes to upstream/v8.0.0-M1 branch

[meowool-bot]

Important

Since the latest distribution changes cannot be merged into the upstream/v8.0.0-M1 branch, so it has now been renamed to unchanged/v8.0.0-M1 branch.

Distribution Changes

gradle/gradle@v7.5.1...meowool:sweekt-gradle:backup/v7.5.1

Steps to reproduce

$ git checkout upstream/v8.0.0-M1
$ git merge backup/v7.5.1

Errors

Merge from backup/v7.5.1

$ git merge backup/v7.5.1 --verbose

Auto-merging .editorconfig
Auto-merging .idea/codeStyles/Project.xml
Auto-merging build-logic/basics/src/main/kotlin/gradlebuild.repositories.gradle.kts
Auto-merging build-logic/dependency-modules/src/main/kotlin/gradlebuild/modules/extension/ExternalModulesExtension.kt
Auto-merging gradle/verification-metadata.xml
Auto-merging gradle/wrapper/gradle-wrapper.properties
Auto-merging subprojects/core-api/src/main/java/org/gradle/api/artifacts/dsl/DependencyHandler.java
Auto-merging subprojects/core/src/main/java/org/gradle/api/internal/project/DefaultProject.java
Auto-merging subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/DefaultDependencyFactory.java
CONFLICT (content): Merge conflict in subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/DefaultDependencyFactory.java
Auto-merging subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/dsl/dependencies/DefaultDependencyHandler.java
Auto-merging subprojects/kotlin-dsl/build.gradle.kts
Auto-merging subprojects/kotlin-dsl/src/main/kotlin/org/gradle/kotlin/dsl/DependencyHandlerExtensions.kt
Auto-merging subprojects/kotlin-dsl/src/main/kotlin/org/gradle/kotlin/dsl/support/KotlinCompiler.kt
CONFLICT (content): Merge conflict in subprojects/kotlin-dsl/src/main/kotlin/org/gradle/kotlin/dsl/support/KotlinCompiler.kt
Auto-merging subprojects/kotlin-dsl/src/main/kotlin/org/gradle/kotlin/dsl/support/delegates/DependencyHandlerDelegate.kt
Auto-merging subprojects/kotlin-dsl/src/test/kotlin/org/gradle/kotlin/dsl/codegen/GradleApiExtensionsTest.kt
Automatic merge failed; fix conflicts and then commit the result.

View the full workflow running log in https://github.com/meowool/sweekt-gradle/actions/runs/5987824851