Update r-daily.yml

rstats-on-nix · Apr 5, 2024 · 832bc16 · 832bc16
1 parent a35fb0d
commit 832bc16
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/.github/workflows/r-daily.yml b/.github/workflows/r-daily.yml
@@ -42,10 +42,11 @@ 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 merge upstream/master
+          git reset --hard upstream/master
+          #git merge upstream/master
 
       - name: Update R packages
         run: |