From 1097774a9677bb7ccf6c44507f18615ae8180593 Mon Sep 17 00:00:00 2001 From: Ayush Tiwari Date: Sat, 14 Oct 2023 03:52:43 +0530 Subject: [PATCH] BI-29: small fix for commit 8479d38 --- .github/workflows/actions.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 25e4161..7387c8b 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -72,11 +72,11 @@ jobs: - name: Check for Divergence run: | - if git merge-base --is-ancestor main @ + if git merge-base --is-ancestor origin/main HEAD then - echo "Your branch is up to date." + echo "Your branch is up to date with the main branch." exit 0 else - echo "You need to merge / rebase." + echo "Your branch is not up to date. You need to merge or rebase." exit 1 fi \ No newline at end of file