Update .gitlab-ci.yml file

This commit is contained in:
Kewbit 2024-11-27 22:50:23 +00:00
parent 311116f4fb
commit 8f1215e568

View file

@ -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