diff --git a/.github/workflows/r-daily.yml b/.github/workflows/r-daily.yml index 9c03d1ff88a5d4..8b018e0d0607c2 100644 --- a/.github/workflows/r-daily.yml +++ b/.github/workflows/r-daily.yml @@ -44,7 +44,7 @@ jobs: git checkout r-daily-source git fetch origin # in case of conflict, commit this next line, and follow instructions in the next comment two lines below - #git merge origin/r-daily + git merge origin/r-daily git fetch upstream # in case of conflict, uncomment the next 5 lines and comment the last #git checkout upstream/master -- pkgs/development/r-modules/default.nix