From 10a6d5cd3c6c91a9e9d8f3dbda3e4187b8e416e0 Mon Sep 17 00:00:00 2001
From: Vojdan Kjorveziroski <vojdan.kjorveziroski@finki.ukim.mk>
Date: Mon, 28 Apr 2025 12:55:22 +0200
Subject: [PATCH] bump version

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 07398cd..6beee79 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,6 +20,7 @@ version-bump-dev:
     - export MASTER_CHART_VERSION=$(yq e '.version' charts/$CHART_NAME/Chart.yaml)
     - git checkout $CI_COMMIT_REF_NAME
     - git branch --set-upstream-to=origin/$CI_COMMIT_REF_NAME $CI_COMMIT_REF_NAME
+    - git rebase --quit
     - git pull
     - export CURRENT_CHART_VERSION=$(yq e '.version' charts/$CHART_NAME/Chart.yaml)
     - export CURRENT_DOCKER_IMAGE_VERSION=$(yq e '.platform.image.tag' charts/$CHART_NAME/values.yaml)
-- 
GitLab