Search Options

Display Count
Sort
Preferred Language
Advanced Search

Results 21 - 30 of 329 for mergeId (0.06 seconds)

  1. .github/workflows/CheckBadMerge.groovy

     * but sometimes changes on release notes.md was brought to master and merged unnoticed,
     * e.g https://github.com/gradle/gradle/pull/25825
     *
     * This script is to check if there is any merge commit that brings changes from release branch to master.
     * Usage: groovy CheckBadMerge.groovy <commit1> <commit2> ...
     * If any "bad" merge commit is found, it will print the details and exit with non-zero code.
     */
    class CheckBadMerge {
    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)
  2. doc/README.md

    new files. **Do not add RELNOTE=yes comments in CLs.** Instead, add a file to
    the CL (or ask the author to do so).
    
    At the end of the development cycle, the files will be merged by being
    concatenated in sorted order by pathname. Files in the directory matching the
    glob "*stdlib/*minor" are treated specially. They should be in subdirectories
    Created: Tue Dec 30 11:13:12 GMT 2025
    - Last Modified: Mon Jul 22 17:55:04 GMT 2024
    - 3.1K bytes
    - Click Count (0)
  3. compat/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java

     */
    @Deprecated(since = "4.0.0")
    public interface ModelNormalizer {
    
        /**
         * Merges duplicate elements like multiple declarations of the same build plugin in the specified model.
         *
         * @param model The model whose duplicate elements should be merged, must not be {@code null}.
         * @param request The model building request that holds further settings, must not be {@code null}.
    Created: Sun Dec 28 03:35:09 GMT 2025
    - Last Modified: Tue Feb 25 08:27:34 GMT 2025
    - 2.4K bytes
    - Click Count (0)
  4. compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java

                metadata.storeInLocalRepository(localRepo, localRepo);
                merged = true;
            } catch (Exception e) {
                throw new RepositoryException(e.getMessage(), e);
            }
        }
    
        @Override
        public boolean isMerged() {
            return merged;
        }
    
        @Override
        public String getGroupId() {
            return emptify(metadata.getGroupId());
        }
    
    Created: Sun Dec 28 03:35:09 GMT 2025
    - Last Modified: Fri Jun 06 14:28:57 GMT 2025
    - 4.5K bytes
    - Click Count (0)
  5. api/maven-api-xml/src/main/java/org/apache/maven/api/xml/XmlNode.java

         * @return the merged node
         *
         * @deprecated use {@link XmlService#merge(XmlNode, XmlNode, Boolean)} instead
         */
        @Deprecated(since = "4.0.0", forRemoval = true)
        @Nullable
        static XmlNode merge(@Nullable XmlNode dominant, @Nullable XmlNode recessive) {
            return XmlService.merge(dominant, recessive, null);
        }
    
        @Nullable
        static XmlNode merge(
    Created: Sun Dec 28 03:35:09 GMT 2025
    - Last Modified: Wed Dec 17 15:20:44 GMT 2025
    - 18.3K bytes
    - Click Count (0)
  6. cmd/data-usage-cache.go

    	}
    	for k, v := range d.Cache {
    		clone.Cache[k] = v.clone()
    	}
    	return clone
    }
    
    // merge root of other into d.
    // children of root will be flattened before being merged.
    // Last update time will be set to the last updated.
    func (d *dataUsageCache) merge(other dataUsageCache) {
    	existingRoot := d.root()
    	otherRoot := other.root()
    	if existingRoot == nil && otherRoot == nil {
    		return
    Created: Sun Dec 28 19:28:13 GMT 2025
    - Last Modified: Sun Sep 28 20:59:21 GMT 2025
    - 34.7K bytes
    - Click Count (0)
  7. impl/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java

            Settings recessive = Settings.newBuilder()
                    .pluginGroups(Arrays.asList("org.codehaus.plexus"))
                    .build();
    
            Settings merged = SettingsUtilsV4.merge(dominant, recessive);
    
            List<String> pluginGroups = merged.getPluginGroups();
    
            assertNotNull(pluginGroups);
            assertEquals(3, pluginGroups.size());
            assertEquals("org.apache.maven.plugins", pluginGroups.get(0));
    Created: Sun Dec 28 03:35:09 GMT 2025
    - Last Modified: Fri Jan 24 17:29:44 GMT 2025
    - 6.7K bytes
    - Click Count (0)
  8. compat/maven-model/src/main/java/org/apache/maven/model/merge/package-info.java

     * KIND, either express or implied.  See the License for the
     * specific language governing permissions and limitations
     * under the License.
     */
    
    /**
     * POM merger.
     */
    Created: Sun Dec 28 03:35:09 GMT 2025
    - Last Modified: Sun Mar 30 14:10:21 GMT 2025
    - 870 bytes
    - Click Count (0)
  9. cmd/xl-storage-format-v2_test.go

    				}
    				vMod = append(vMod, newVers)
    			}
    			merged := mergeXLV2Versions(i, true, 0, vMod...)
    			if len(merged) == 0 && i < 2 {
    				t.Error("Did not get any results")
    				return
    			}
    			if len(merged) > 0 && i >= 2 {
    				t.Error("Got unexpected results", len(merged), merged[0].header)
    				return
    			}
    			for _, ver := range merged {
    				if ver.header.Type == invalidVersionType {
    Created: Sun Dec 28 19:28:13 GMT 2025
    - Last Modified: Fri Aug 29 02:39:48 GMT 2025
    - 37.8K bytes
    - Click Count (0)
  10. build-logic/binary-compatibility/src/main/groovy/gradlebuild/binarycompatibility/rules/AbstractGradleViolationRule.groovy

                    If change was made on the `release` branch but hasn't yet been merged to `master`, merge `release` to `master`:
                    <a class="btn btn-info" role="button" data-toggle="collapse" href="#merge-release-${changeId}" aria-expanded="false" aria-controls="collapseExample">Merge release to master</a>
                    <div class="collapse" id="merge-release-${changeId}">
                      <div class="well">
    Created: Wed Dec 31 11:36:14 GMT 2025
    - Last Modified: Tue Dec 30 10:14:25 GMT 2025
    - 10.5K bytes
    - Click Count (0)
Back to Top