From 69cfed89e5a6a7d21a94a6bef371d186ceeddabc Mon Sep 17 00:00:00 2001 From: ckie Date: Fri, 10 Jun 2022 14:47:10 +0300 Subject: [PATCH] .github: disable rebasing so git doesn't get confused --- .github/workflows/update-dependencies.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml index a07166b..5b5ed1f 100644 --- a/.github/workflows/update-dependencies.yml +++ b/.github/workflows/update-dependencies.yml @@ -40,6 +40,7 @@ jobs: git config --global user.name github-actions[bot] git config --global user.email 41898282+github-actions[bot]@users.noreply.github.com git config --global init.defaultBranch main + git config --global pull.rebase false - uses: actions/checkout@v2 with: # Nix Flakes doesn't work on shallow clones