Updating --ignore-conflicts

bcgov · Jul 12, 2024 · b135368 · b135368
1 parent 0087f2e
commit b135368
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/Manual Build Check.yml b/.github/workflows/Manual Build Check.yml
@@ -47,7 +47,7 @@ jobs:
       run: sf project deploy start -d dev-app-pre -o ciorg 
 
     - name: Deploy source force-app
-      run: sf project deploy start -d force-app -o ciorg 
+      run: sf project deploy start -d force-app -o ciorg --ignore-conflicts
 
     - name: Deploy source default objects
       run: sf project deploy start -d force-app/main/default/objects -o ciorg -w 15

diff --git a/.github/workflows/build-checks.yml b/.github/workflows/build-checks.yml
@@ -46,7 +46,7 @@ jobs:
       run: sf project deploy start -d dev-app-pre -o ciorg 
 
     - name: Deploy source force-app
-      run: sf project deploy start -d force-app -o ciorg 
+      run: sf project deploy start -d force-app -o ciorg --ignore-conflicts
 
     - name: Deploy source default objects
       run: sf project deploy start -d force-app/main/default/objects -o ciorg -w 15