From 481ac166d0ff698c9b69805929985de2afd9ccd2 Mon Sep 17 00:00:00 2001
From: Lee Chapman <lee@fullmetal.dev>
Date: Sat, 10 Jan 2026 16:50:37 -0800
Subject: [PATCH] fix: use force push to override GitLab branch

- Remove git pull step that was causing merge conflicts
- Add --force flag to git push to handle branch divergence
- This allows GitHub to override GitLab branch when they diverge
---
 .github/workflows/tests.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 690c7a0..6164536 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -81,5 +81,4 @@ jobs:
         git remote add gitlab https://gitlab.com/dk-raas/dkai/high-command/high-command-api.git
         git config credential.helper '!f() { echo "username=oauth2"; echo "password=${GITLAB_TOKEN}"; }; f'
         git fetch gitlab main
-        git pull gitlab main --no-edit
-        git push gitlab HEAD:main
+        git push gitlab HEAD:main --force