Update r-daily.yml

rstats-on-nix · Apr 5, 2024 · 653bc58 · 653bc58
1 parent 832bc16
commit 653bc58
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/.github/workflows/r-daily.yml b/.github/workflows/r-daily.yml
@@ -42,11 +42,12 @@ jobs:
         run: |
           git remote add upstream https://github.com/nixos/nixpkgs
           git checkout r-daily-source
-          #git fetch origin
-          #git merge origin/r-daily
+          git fetch origin
+          git merge origin/r-daily
           git fetch upstream
-          git reset --hard upstream/master
-          #git merge upstream/master
+          # in case of conflict, uncomment the next line
+          git checkout upstream/r-daily-source -- pkgs/development/r-modules/default.nix
+          git merge upstream/master
 
       - name: Update R packages
         run: |