diff --git a/.github/workflows/build_rootless.yml b/.github/workflows/build_rootless.yml index 8ddabb0..846e468 100644 --- a/.github/workflows/build_rootless.yml +++ b/.github/workflows/build_rootless.yml @@ -45,7 +45,8 @@ jobs: git fetch origin 8da9c556bdbab4570addc3308fe621dac70df133 git checkout 8da9c556bdbab4570addc3308fe621dac70df133 git apply rootless.patch - git merge main --allow-unrelated-histories + git commit -am "patch" + git merge main - name: Build Tweak id: build run: |