From 7a136c29704b58d1d27a8d700b1d5ac5a6592d62 Mon Sep 17 00:00:00 2001 From: Kartik Pradeepan Date: Thu, 22 Aug 2024 16:30:19 -0400 Subject: [PATCH] Swapped rebase with merge. Added some push error handling in autosync. --- .github/workflows/sync_develop_with_master.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/sync_develop_with_master.yml b/.github/workflows/sync_develop_with_master.yml index d28a4d2f5..df8cc238d 100644 --- a/.github/workflows/sync_develop_with_master.yml +++ b/.github/workflows/sync_develop_with_master.yml @@ -108,5 +108,4 @@ jobs: run: > echo "Handle non-conflict related failure, such as network issues or missing branches" - # Possibly incorporate additional handling logic here (e.g., - notifications or retries) \ No newline at end of file + # Possibly incorporate additional handling logic here (e.g.,notifications or retries) \ No newline at end of file