Update r-daily.yml

rstats-on-nix · Apr 5, 2024 · 203a6e3 · 203a6e3
1 parent 306e3a8
commit 203a6e3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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: |