From 488a537d9b5c3fa77acb801194e1c5eb5f98827d Mon Sep 17 00:00:00 2001
From: Clayton Collie <clayton.collie@gmail.com>
Date: Mon, 16 Sep 2024 07:57:29 -0500
Subject: [PATCH] dir merge

---
 deploy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy.sh b/deploy.sh
index 441a489..d8267dd 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -99,7 +99,7 @@ if [[ "$BUILD_DIR" = false ]]; then
 		# The --filter flag will allow the full .gitignore syntax to be used in .distignore
 		# The --delete flag will delete anything in destination that no longer exists in source
 		# rsync -rc --filter="dir-merge,- $GITHUB_WORKSPACE/.distignore" "$GITHUB_WORKSPACE/" trunk/ --delete --delete-excluded
-		rsync -rcv --filter="merge $GITHUB_WORKSPACE/.distignore" "$GITHUB_WORKSPACE/" trunk/ --delete --delete-excluded --itemize-changes
+		rsync -rcv --filter="dir-merge $GITHUB_WORKSPACE/.distignore" "$GITHUB_WORKSPACE/" trunk/ --delete --delete-excluded --itemize-changes
 	else
 		echo "ℹ︎ Using .gitattributes"