diff options
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index c610e07089..8e593d2b53 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -101,7 +101,7 @@ task: - git reset --hard - if ($env:CIRRUS_PR -eq $null) { exit 0; } - git fetch $env:CIRRUS_REPO_CLONE_URL $env:CIRRUS_BASE_BRANCH - - git merge FETCH_HEAD <# Merge base to detect silent merge conflicts #> + - git merge FETCH_HEAD vcpkg_cache: folder: 'C:\Users\ContainerAdministrator\AppData\Local\vcpkg\archives' install_python_script: |