From ddaa2a0e20683466f9cfbde029f5a2196ece339a Mon Sep 17 00:00:00 2001
From: Linus Flood <linus.flood@scandichotels.com>
Date: Wed, 13 Aug 2025 12:31:28 +0000
Subject: [PATCH] Merged in fix/branch-sync-2 (pull request #2643)

Fix/branch sync 2

* feat(branch sync)-fixed ignore script

* feat(branch sync)-fixed ignore script

* merge master

* Merge branch 'master' into fix/branch-sync-2

* Revert branch sync

* Ignore ignore script

* Merge branch 'master' into fix/branch-sync-2
---
 apps/partner-sas/netlify.toml       | 2 +-
 apps/scandic-redirect/netlify.toml  | 2 +-
 apps/scandic-web/netlify.toml       | 2 +-
 packages/design-system/netlify.toml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/partner-sas/netlify.toml b/apps/partner-sas/netlify.toml
index 04dd1b88b..9e2832944 100644
--- a/apps/partner-sas/netlify.toml
+++ b/apps/partner-sas/netlify.toml
@@ -2,7 +2,7 @@
 command = "yarn test && yarn build:sas"
 publish = "apps/partner-sas/.next"
 
-ignore = "if [ -z ${CACHED_COMMIT_REF+x} ] ; then false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF apps/partner-sas packages/common packages/trpc packages/design-system packages/typescript-config ; fi"
+#ignore = "if [ -z ${CACHED_COMMIT_REF+x} ] ; then false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF apps/partner-sas packages/common packages/trpc packages/design-system packages/typescript-config ; fi"
 
 [context.branch-deploy]
 command = "yarn test && yarn build:sas"
diff --git a/apps/scandic-redirect/netlify.toml b/apps/scandic-redirect/netlify.toml
index 66667f7c4..a2d6ded83 100644
--- a/apps/scandic-redirect/netlify.toml
+++ b/apps/scandic-redirect/netlify.toml
@@ -1,6 +1,6 @@
 [build]
 
-ignore = "if [ -z ${CACHED_COMMIT_REF+x} ] ; then false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF apps/scandic-redirect ; fi"
+#ignore = "if [ -z ${CACHED_COMMIT_REF+x} ] ; then false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF apps/scandic-redirect ; fi"
 
 
 [functions]
diff --git a/apps/scandic-web/netlify.toml b/apps/scandic-web/netlify.toml
index b8d0c4195..26bd46abb 100644
--- a/apps/scandic-web/netlify.toml
+++ b/apps/scandic-web/netlify.toml
@@ -2,7 +2,7 @@
 command = "yarn test && yarn build:web"
 publish = "apps/scandic-web/.next"
 
-ignore = "if [ -z ${CACHED_COMMIT_REF+x} ] ; then false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF apps/scandic-web packages/common packages/trpc packages/design-system packages/typescript-config ; fi"
+#ignore = "if [ -z ${CACHED_COMMIT_REF+x} ] ; then false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF apps/scandic-web packages/common packages/trpc packages/design-system packages/typescript-config ; fi"
 
 [context.branch-deploy]
 command = "yarn test && yarn build:web"
diff --git a/packages/design-system/netlify.toml b/packages/design-system/netlify.toml
index 4ed24c3f6..c756641f2 100644
--- a/packages/design-system/netlify.toml
+++ b/packages/design-system/netlify.toml
@@ -1,2 +1,2 @@
 [build]
-ignore = "if [ -z ${CACHED_COMMIT_REF+x} ] ; then false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF packages/design-system packages/typescript-config ; fi"
\ No newline at end of file
+#ignore = "if [ -z ${CACHED_COMMIT_REF+x} ] ; then false ; else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF packages/design-system packages/typescript-config ; fi"
\ No newline at end of file