Search Options

Display Count
Sort
Preferred Language
Advanced Search

Results 1 - 10 of 172 for conflict (0.13 seconds)

  1. .github/workflows/detect-conflicts.yml

    name: "Conflict detector"
    on:
      push:
      pull_request_target:
        types: [synchronize]
    
    jobs:
      main:
        permissions:
          contents: read
          pull-requests: write
        runs-on: ubuntu-latest
        steps:
          - name: Check if PRs have merge conflicts
            uses: eps1lon/actions-label-merge-conflict@v3
            with:
              dirtyLabel: "conflicts"
              repoToken: "${{ secrets.GITHUB_TOKEN }}"
    Created: Sun Apr 05 07:19:11 GMT 2026
    - Last Modified: Fri Sep 05 08:33:44 GMT 2025
    - 499 bytes
    - Click Count (0)
  2. impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/PrecedenceCoreExtensionSelector.java

                for (String conflict : conflicts) {
                    context.logger.warn("* " + conflict);
                }
                context.logger.warn("");
                context.logger.warn(
                        "Order of core extensions precedence is project > user > installation. Selected extensions are:");
                for (CoreExtension extension : selectedExtensions.values()) {
    Created: Sun Apr 05 03:35:12 GMT 2026
    - Last Modified: Mon Sep 29 15:32:43 GMT 2025
    - 4.6K bytes
    - Click Count (0)
  3. compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverFactory.java

        // methods ----------------------------------------------------------------
    
        /**
         * Gets a conflict resolver of the specified type.
         *
         * @param type the type of conflict resolver to obtain
         * @return the conflict resolver
         * @throws ConflictResolverNotFoundException
         *          if the specified type was not found
         */
    Created: Sun Apr 05 03:35:12 GMT 2026
    - Last Modified: Fri Oct 25 12:31:46 GMT 2024
    - 1.6K bytes
    - Click Count (0)
  4. futures/listenablefuture9999/pom.xml

        listenablefuture-9999.0-empty-to-avoid-conflict-with-guava. The 9999.0-...
        version number is enough for some build systems (notably, Gradle) to select
        that empty artifact over the "real" listenablefuture-1.0 -- avoiding a
        conflict with the copy of ListenableFuture in guava itself. If users are
        using an older version of Guava or a build system other than Gradle, they
        may see class conflicts. If so, they can solve them by manually excluding
    Created: Fri Apr 03 12:43:13 GMT 2026
    - Last Modified: Thu Oct 02 19:27:26 GMT 2025
    - 2.1K bytes
    - Click Count (0)
  5. CODE_OF_CONDUCT.md

    If you are experiencing or witnessing conflict, we ask you to use the following escalation strategy to address the conflict:
    
    1.  Address the perceived conflict directly with those involved, preferably in a
        real-time medium.
    Created: Tue Apr 07 12:39:13 GMT 2026
    - Last Modified: Fri Feb 05 18:43:16 GMT 2021
    - 5.2K bytes
    - Click Count (0)
  6. src/cmd/asm/internal/arch/riscv64.go

    			// names are disjoint and so can safely share a single namespace. However,
    			// it's possible that a future update to the CSRs in inst.go could introduce
    			// a conflict. This check ensures that such a conflict does not go
    			// unnoticed.
    			if _, ok := riscv64SpecialOperand[csrName]; ok {
    				panic(fmt.Sprintf("riscv64 special operand %q redefined", csrName))
    			}
    Created: Tue Apr 07 11:13:11 GMT 2026
    - Last Modified: Wed Apr 01 04:17:57 GMT 2026
    - 3K bytes
    - Click Count (0)
  7. compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java

     * under the License.
     */
    package org.apache.maven.repository.metadata;
    
    import org.apache.maven.artifact.ArtifactScopeEnum;
    
    /**
     * Resolves conflicts in the supplied dependency graph.
     * Different implementations will implement different conflict resolution policies.
     *
     */
    @Deprecated
    public interface GraphConflictResolver {
        String ROLE = GraphConflictResolver.class.getName();
    
        /**
    Created: Sun Apr 05 03:35:12 GMT 2026
    - Last Modified: Fri Oct 25 12:31:46 GMT 2024
    - 1.7K bytes
    - Click Count (0)
  8. compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java

     * KIND, either express or implied.  See the License for the
     * specific language governing permissions and limitations
     * under the License.
     */
    package org.apache.maven.repository.legacy.resolver.conflict;
    
    import javax.inject.Inject;
    import javax.inject.Named;
    import javax.inject.Singleton;
    
    import org.codehaus.plexus.PlexusConstants;
    import org.codehaus.plexus.PlexusContainer;
    Created: Sun Apr 05 03:35:12 GMT 2026
    - Last Modified: Fri Jun 06 14:28:57 GMT 2025
    - 2.8K bytes
    - Click Count (0)
  9. futures/listenablefuture1/pom.xml

        "version" that omits the class to avoid conflicts with the copy in Guava
        itself. The idea is:
    
        - If users want only ListenableFuture, they depend on listenablefuture-1.0.
    
        - If users want all of Guava, they depend on guava, which, as of Guava
        27.0, depends on
        listenablefuture-9999.0-empty-to-avoid-conflict-with-guava. The 9999.0-...
    Created: Fri Apr 03 12:43:13 GMT 2026
    - Last Modified: Thu Oct 02 19:27:26 GMT 2025
    - 2.1K bytes
    - Click Count (0)
  10. build-logic/dependency-modules/src/main/kotlin/gradlebuild.dependency-modules.gradle.kts

            applyRule<DependencyRemovalByNameRule>("org.apache.groovy:groovy-ant", setOf("ant-junit"))
    
            // GCS transitively depends on commons-logging.
            // Ensure jcl-over-slf4j is pulled in when we use GCS so it can conflict.
            applyRule<DependencyAdditionRule>("com.google.apis:google-api-services-storage", "org.slf4j:jcl-over-slf4j")
    
    Created: Wed Apr 01 11:36:16 GMT 2026
    - Last Modified: Thu Mar 26 09:04:32 GMT 2026
    - 9.5K bytes
    - Click Count (0)
Back to Top