Search Options

Display Count
Sort
Preferred Language
Advanced Search

Results 11 - 20 of 221 for Merging (0.05 seconds)

  1. android-test/build.gradle.kts

      }
    
      testOptions {
        targetSdk = 34
        unitTests.isIncludeAndroidResources = true
      }
    
      kotlinOptions {
        jvmTarget = JavaVersion.VERSION_11.toString()
      }
    
      // issue merging due to conflict with httpclient and something else
      packagingOptions.resources.excludes += setOf(
        "META-INF/DEPENDENCIES",
        "META-INF/LICENSE.md",
        "META-INF/LICENSE-notice.md",
        "README.txt",
    Created: Fri Dec 26 11:42:13 GMT 2025
    - Last Modified: Fri Nov 21 12:33:41 GMT 2025
    - 3.9K bytes
    - Click Count (2)
  2. compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java

            // snapshot timestamp, or some other timestamp later encoded into the metadata.
            // TODO this needs to be repeated here so the merging doesn't interfere with the written metadata
            //  - we'd be much better having a pristine input, and an ongoing metadata for merging instead
    
            Map<ArtifactRepository, Metadata> previousMetadata = new HashMap<>();
            ArtifactRepository selected = null;
    Created: Sun Dec 28 03:35:09 GMT 2025
    - Last Modified: Fri Jun 06 14:28:57 GMT 2025
    - 18.9K bytes
    - Click Count (0)
  3. .github/PULL_REQUEST_TEMPLATE.md

    - [ ] Ensure that tests pass sanity check: `./gradlew sanityCheck`.
    - [ ] Ensure that tests pass locally: `./gradlew <changed-subproject>:quickTest`.
    
    ### Reviewing cheatsheet
    
    Before merging the PR, comments starting with 
    - ❌ ❓**must** be fixed
    - 🤔 💅 **should** be fixed
    - 💭 **may** be fixed
    Created: Wed Dec 31 11:36:14 GMT 2025
    - Last Modified: Tue Feb 13 22:36:19 GMT 2024
    - 1.7K bytes
    - Click Count (0)
  4. compat/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java

    import org.apache.maven.model.Plugin;
    import org.apache.maven.model.PluginContainer;
    
    /** @deprecated */
    @Deprecated
    public final class ModelUtils {
    
        /**
         * This should be the resulting ordering of plugins after merging:
         * <p>
         * Given:
         * <pre>
         * parent: X -&gt; A -&gt; B -&gt; D -&gt; E
         * child: Y -&gt; A -&gt; C -&gt; D -&gt; F
         * </pre>
         * Result:
         * <pre>
    Created: Sun Dec 28 03:35:09 GMT 2025
    - Last Modified: Fri Oct 25 12:31:46 GMT 2024
    - 2K bytes
    - Click Count (0)
  5. PULL_REQUESTS_ETIQUETTE.md

       - Include context in the summary: what changed, why, and any issue references.
       - Use `[WIP]` for in-progress PRs to avoid premature merging or choose GitHub draft PRs.
    
    2. **Commits**:
       - Write clear messages: what changed and why (e.g., “Refactor S3 API handler to reduce latency so that requests process 20% faster”).
    Created: Sun Dec 28 19:28:13 GMT 2025
    - Last Modified: Sun May 25 16:32:03 GMT 2025
    - 4.7K bytes
    - Click Count (0)
  6. compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java

            return null;
        }
    
        @Override
        public void setRepository(ArtifactRepository remoteRepository) {
            /*
             * NOTE: Metadata at the g:a level contains a collection of available versions. After merging, we can't tell
             * which repository provides which version so the metadata manager must not restrict the artifact resolution to
             * the repository with the most recent updates.
             */
        }
    Created: Sun Dec 28 03:35:09 GMT 2025
    - Last Modified: Fri Jun 06 14:28:57 GMT 2025
    - 3.6K bytes
    - Click Count (0)
  7. .github/workflows/CheckBadMerge.groovy

    import java.util.concurrent.Executors
    import java.util.concurrent.Future
    import java.nio.file.Files
    import java.nio.file.Paths
    
    /**
     * See https://github.com/gradle/gradle-private/issues/3919
     *
     * When merging `releaseX` branch into `master`, we should only use the release note from the `master` branch,
     * but sometimes changes on release notes.md was brought to master and merged unnoticed,
     * e.g https://github.com/gradle/gradle/pull/25825
    Created: Wed Dec 31 11:36:14 GMT 2025
    - Last Modified: Fri Jan 24 10:03:31 GMT 2025
    - 5.8K bytes
    - Click Count (0)
  8. android/guava/src/com/google/common/collect/ImmutableTable.java

       * and column pair, they will be combined with the specified merging function in encounter order.
       *
       * <p>The returned {@code Collector} will throw a {@code NullPointerException} at collection time
       * if the row, column, value, or merging functions return null on any input.
       *
       * @since 33.2.0 (available since 21.0 in guava-jre)
       */
    Created: Fri Dec 26 12:43:10 GMT 2025
    - Last Modified: Mon Sep 22 21:07:18 GMT 2025
    - 17.4K bytes
    - Click Count (0)
  9. compat/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java

             * the first occurrence. So when we're in lenient/compat mode, we have to deal with such broken POMs and mimic
             * the way 2.x works. When we're in strict mode, the removal of duplicates just saves other merging steps from
             * aftereffects and bogus error messages.
             */
            List<Dependency> dependencies = model.getDependencies();
            Map<String, Dependency> normalized = new LinkedHashMap<>(dependencies.size() * 2);
    Created: Sun Dec 28 03:35:09 GMT 2025
    - Last Modified: Tue Feb 25 08:27:34 GMT 2025
    - 4.5K bytes
    - Click Count (0)
  10. build-logic/binary-compatibility/src/test/kotlin/gradlebuild/binarycompatibility/AbstractAcceptedApiChangesMaintenanceTaskIntegrationTest.kt

                            group = "verification"
                            description = "Ensures the accepted api changes file is kept alphabetically ordered to make merging changes to it easier"
                            apiChangesDirectory = layout.projectDirectory.dir("${ TextUtil.normaliseFileSeparators(firstAcceptedApiChangesFile.parentFile.absolutePath) }")
                        }
    
    Created: Wed Dec 31 11:36:14 GMT 2025
    - Last Modified: Fri Nov 29 14:03:44 GMT 2024
    - 6K bytes
    - Click Count (0)
Back to Top