Update .gitlab-ci.yml file
This commit is contained in:
parent
311116f4fb
commit
8f1215e568
1 changed files with 1 additions and 1 deletions
|
@ -23,6 +23,6 @@ update_patched_master:
|
||||||
- echo "Cleaning up after merge..."
|
- echo "Cleaning up after merge..."
|
||||||
- git add .
|
- git add .
|
||||||
- echo "Committing resolved merge..."
|
- 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..."
|
- echo "Pushing changes to patched_master..."
|
||||||
- git push origin patched_master
|
- git push origin patched_master
|
||||||
|
|
Loading…
Reference in a new issue