From bb294affb5ead9f58c218bcfe5742c4c383cb6e5 Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishith.khanna@gmail.com>
Date: Fri, 4 Mar 2022 12:42:13 +0530
Subject: [PATCH] Upstream changes shouldn't be automatically merged

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 69702544c0..f4dd6b10a0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,15 +53,7 @@ build:
     - git pull upstream $UPSTREAM_DEFAULT_BRANCH
     - git push origin $UPSTREAM_BRANCH
     - git push origin --tags
-# checkout to latest tag commit to $TEMP_LATEST_TAG_BRANCH
-    - git checkout $(git describe --tags --abbrev=0)
-    - git checkout -b $TEMP_LATEST_TAG_BRANCH
-# merge $LOCAL_BRANCH with $TEMP_LATEST_TAG_BRANCH & push
-    - git checkout $LOCAL_BRANCH
-    - git merge $TEMP_LATEST_TAG_BRANCH
-    - git push origin $LOCAL_BRANCH
-# remove unwanted local branch & remote
-    - git branch -D $TEMP_LATEST_TAG_BRANCH
+# remove upstream remote
     - git remote remove upstream
 
 update-default-branch:
@@ -71,4 +63,3 @@ update-default-branch:
     UPSTREAM_BRANCH: upstream/master
     UPSTREAM_DEFAULT_BRANCH: main
     UPSTREAM_URL: https://github.com/k9mail/k-9.git
-    TEMP_LATEST_TAG_BRANCH: latest_upstream_tag_branch
-- 
GitLab