From 203a6e36d68123fe911404442a3ccdfb9aa6a0b0 Mon Sep 17 00:00:00 2001 From: Bruno Rodrigues Date: Fri, 5 Apr 2024 09:11:56 +0200 Subject: [PATCH] Update r-daily.yml --- .github/workflows/r-daily.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/r-daily.yml b/.github/workflows/r-daily.yml index df5be0f619c0de..283ffe3a382a69 100644 --- a/.github/workflows/r-daily.yml +++ b/.github/workflows/r-daily.yml @@ -45,9 +45,9 @@ jobs: git fetch origin git merge origin/r-daily git fetch upstream - # in case of conflict, uncomment the next line - git checkout upstream/master -- pkgs/development/r-modules/default.nix - #git merge upstream/master + # in case of conflict, uncomment the next line and comment the last + #git checkout upstream/master -- pkgs/development/r-modules/default.nix + git merge upstream/master - name: Update R packages run: |