From 48927181a4919e5616dec98d4a9be8c5ac258fee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Jul 2026 23:41:56 +0000 Subject: [PATCH 1/3] fix: Bump Microsoft.Data.Sqlite from 10.0.9 to 10.0.10 --- updated-dependencies: - dependency-name: Microsoft.Data.Sqlite dependency-version: 10.0.10 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- JWLMerge.BackupFileServices/JWLMerge.BackupFileServices.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/JWLMerge.BackupFileServices/JWLMerge.BackupFileServices.csproj b/JWLMerge.BackupFileServices/JWLMerge.BackupFileServices.csproj index df2d45d..4b096f2 100644 --- a/JWLMerge.BackupFileServices/JWLMerge.BackupFileServices.csproj +++ b/JWLMerge.BackupFileServices/JWLMerge.BackupFileServices.csproj @@ -18,7 +18,7 @@ - + From bf25cbe5f7822eeccee3768a3d36f05eed55ef23 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 27 Jul 2026 23:50:09 +0000 Subject: [PATCH 2/3] Fix dependabot auto-merge workflow: upgrade fetch-metadata to v3.1.0 and add --auto flag with error handling --- .github/workflows/dependabotautomerge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dependabotautomerge.yml b/.github/workflows/dependabotautomerge.yml index b996e40..d2b2415 100644 --- a/.github/workflows/dependabotautomerge.yml +++ b/.github/workflows/dependabotautomerge.yml @@ -10,11 +10,11 @@ jobs: steps: - name: Dependabot metadata id: metadata - uses: dependabot/fetch-metadata@v2.3.0 + uses: dependabot/fetch-metadata@v3.1.0 with: github-token: "${{ secrets.GITHUB_TOKEN }}" - name: Merge Dependabot PRs - run: gh pr merge --rebase "$PR_URL" + run: gh pr merge --auto --rebase "$PR_URL" || true env: PR_URL: ${{ github.event.pull_request.html_url }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From b7f3ac7941e1a190072e759a328807ab92c4e75a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 28 Jul 2026 00:02:28 +0000 Subject: [PATCH 3/3] Fall back to direct merge if auto-merge is not available --- .github/workflows/dependabotautomerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependabotautomerge.yml b/.github/workflows/dependabotautomerge.yml index d2b2415..67032bf 100644 --- a/.github/workflows/dependabotautomerge.yml +++ b/.github/workflows/dependabotautomerge.yml @@ -14,7 +14,7 @@ jobs: with: github-token: "${{ secrets.GITHUB_TOKEN }}" - name: Merge Dependabot PRs - run: gh pr merge --auto --rebase "$PR_URL" || true + run: gh pr merge --auto --rebase "$PR_URL" || gh pr merge --rebase "$PR_URL" env: PR_URL: ${{ github.event.pull_request.html_url }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}