This is an automated email from the ASF dual-hosted git repository.
akm pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/mahout.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6a6f0f65b Update website.yml
6a6f0f65b is described below
commit 6a6f0f65bb9ecc9d4db7135941b3cacc6db25935
Author: Andrew Musselman <[email protected]>
AuthorDate: Wed Feb 8 15:07:38 2023 -0800
Update website.yml
Trying to force it to merge
---
.github/workflows/website.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
index 02500b6dd..982c1fb0d 100644
--- a/.github/workflows/website.yml
+++ b/.github/workflows/website.yml
@@ -42,7 +42,7 @@ jobs:
run: |
git config user.name "GitHub Actions Bot"
git config user.email "<>"
- git config pull.ff only
+ git config pull.rebase false
./website/build_site.sh
rm -rf *
git checkout asf-site
