From 8f1215e5683c71205e6e74a0fd59ede13cd3165f Mon Sep 17 00:00:00 2001 From: Kewbit Date: Wed, 27 Nov 2024 22:50:23 +0000 Subject: [PATCH] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 43f874f6..df8e76c6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,6 +23,6 @@ update_patched_master: - echo "Cleaning up after merge..." - git add . - echo "Committing resolved merge..." - - git commit -m "Auto-resolve merge conflicts: Favor patched_changes" + - git commit -m "Auto-resolve merge conflicts Favor patched_changes" - echo "Pushing changes to patched_master..." - git push origin patched_master