diff --git a/.github/workflows/condapublish.yml b/.github/workflows/condapublish.yml index 679f15ec..75b7306b 100644 --- a/.github/workflows/condapublish.yml +++ b/.github/workflows/condapublish.yml @@ -42,8 +42,8 @@ jobs: cd dst git remote add upstream https://github.com/conda-forge/${REPO_NAME}-feedstock.git git fetch upstream - git checkout master - git merge upstream/master + git checkout main + git merge upstream/main # Generate meta.yaml - name: Generate and push meta.yaml