Search Options

Display Count
Sort
Preferred Language
Advanced Search

Results 1 - 10 of 60 for Merge (0.02 seconds)

  1. src/main/java/org/codelibs/fess/suggest/entity/SuggestItemMerger.java

         * </ul>
         *
         * @param item1 The first SuggestItem (base item)
         * @param item2 The second SuggestItem (item to merge in)
         * @return A new merged SuggestItem
         * @throws IllegalArgumentException if item IDs don't match
         */
        public static SuggestItem merge(final SuggestItem item1, final SuggestItem item2) {
            if (!item1.getId().equals(item2.getId())) {
    Created: Fri Apr 17 09:08:13 GMT 2026
    - Last Modified: Sun Feb 01 12:48:24 GMT 2026
    - 5.4K bytes
    - Click Count (0)
  2. .teamcity/scripts/CheckBadMerge.java

     * 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 (Java 11+ single-file source execution):
     *   java .teamcity/scripts/CheckBadMerge.java < commits.txt
     *
     * If any "bad" merge commit is found, it will print the details and exit with non-zero code.
     */
    public class CheckBadMerge {
    Created: Wed Apr 01 11:36:16 GMT 2026
    - Last Modified: Mon Mar 30 16:25:09 GMT 2026
    - 9K bytes
    - Click Count (0)
  3. docs/en/docs/management-tasks.md

    If the tests are passing, you can merge it right away.
    
    ## Dependabot PRs
    
    Dependabot will create PRs to update dependencies for several things, and those PRs all look similar, but some are way more delicate than others.
    
    Created: Sun Apr 05 07:19:11 GMT 2026
    - Last Modified: Mon Mar 23 13:59:26 GMT 2026
    - 10.7K bytes
    - Click Count (0)
  4. impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java

                        .collect(Collectors.toMap(
                                DefaultConsumerPomBuilder::getDependencyKey,
                                Function.identity(),
                                this::merge,
                                LinkedHashMap::new));
                Map<String, Dependency> managedDependencies = model.getDependencyManagement().getDependencies().stream()
                        .filter(dependency ->
    Created: Sun Apr 05 03:35:12 GMT 2026
    - Last Modified: Wed Mar 04 19:49:40 GMT 2026
    - 22.3K bytes
    - Click Count (0)
  5. .teamcity/scripts/FindCommits.java

     *
     * Usage (Java 11+ single-file source execution):
     *   java .teamcity/scripts/FindCommits.java <target_branch_name>
     *
     * Commit range logic:
     * - Uses origin/<target_branch_name> as the target
     * - If HEAD is a merge commit and one parent equals the target SHA, the other parent is treated as PR head
     * - Otherwise HEAD itself is treated as PR head
     *
     * Output:
     * - Writes commit SHAs to stdout, one per line
     * - Diagnostic info to stderr
    Created: Wed Apr 01 11:36:16 GMT 2026
    - Last Modified: Tue Jan 20 03:53:25 GMT 2026
    - 5.5K bytes
    - Click Count (0)
  6. build-logic-commons/basics/src/main/kotlin/gradlebuild/basics/BuildParams.kt

        get() = environmentVariable(BUILD_BRANCH).orElse(currentGitBranchViaFileSystemQuery())
    
    
    /**
     * The logical branch.
     * For non-merge-queue branches this is the same as {@link #buildBranch}.
     * For merge-queue branches, this is the base branch.
     *
     * For example, for the merge queue branch "gh-readonly-queue/master/pr-12345-1a2b3c4d" the logical branch is "master".
     */
    val Project.logicalBranch: Provider<String>
    Created: Wed Apr 01 11:36:16 GMT 2026
    - Last Modified: Mon Jan 19 05:13:29 GMT 2026
    - 18K bytes
    - Click Count (0)
  7. build-logic/binary-compatibility/src/main/groovy/gradlebuild/binarycompatibility/rules/AbstractGradleViolationRule.groovy

                    </details>
                    <details>
                      <summary>
                        If change was made on the `release` branch but hasn't yet been merged to `master`, merge `release` to `master`:
                        <span class="btn btn-info" role="button">Merge release to master</span>
                      </summary>
                      <div class="well">
    Created: Wed Apr 01 11:36:16 GMT 2026
    - Last Modified: Thu Jan 22 12:18:18 GMT 2026
    - 10K bytes
    - Click Count (0)
  8. docs/en/docs/management.md

    Some of the tasks they can perform include:
    
    * Adding labels to PRs.
    * Editing PR titles.
    * Adding commits on top of PRs to tweak them.
    * Mark answers in GitHub Discussions questions, etc.
    * Merge some specific types of PRs.
    
    You can see the current team members in [FastAPI People - Team](./fastapi-people.md#team).
    
    Created: Sun Apr 05 07:19:11 GMT 2026
    - Last Modified: Thu Mar 05 18:13:19 GMT 2026
    - 1.5K bytes
    - Click Count (0)
  9. .github/pull_request_template.md

    - [ ] Each commit in the pull request should have a meaningful subject line and body.
      Note that commits might be squashed by a maintainer on merge.
    - [ ] Write unit tests that match behavioral changes, where the tests fail if the changes to the runtime are not applied.
      This may not always be possible but is a best-practice.
    Created: Sun Apr 05 03:35:12 GMT 2026
    - Last Modified: Wed Apr 01 17:30:11 GMT 2026
    - 2.1K bytes
    - Click Count (0)
  10. .github/workflows/deploy-docs.yml

          - name: Clean site
            run: |
              rm -rf ./site
              mkdir ./site
          - uses: actions/download-artifact@v8
            with:
              path: ./site/
              pattern: docs-site-*
              merge-multiple: true
              github-token: ${{ secrets.GITHUB_TOKEN }}
              run-id: ${{ github.event.workflow_run.id }}
          - name: Deploy to Cloudflare Pages
            # hashFiles returns an empty string if there are no files
    Created: Sun Apr 05 07:19:11 GMT 2026
    - Last Modified: Tue Mar 03 00:12:02 GMT 2026
    - 2.7K bytes
    - Click Count (0)
Back to Top