haveno-network/haveno-core
haveno-network/haveno-core
1
0
Fork 1
Code Issues 4 Pull requests Projects 5 Releases 1 Packages Wiki Activity Actions

Update .gitlab-ci.yml file

Browse source
This commit is contained in:
Kewbit 2024-11-27 22:54:27 +00:00
parent 8f1215e568
commit 3b6ab28c78
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.gitlab-ci.yml
View file

@ -16,13 +16,8 @@ update_patched_master:
- git remote set-url origin http://oauth2:${GITLAB_ACCESS_TOKEN}@172.17.0.1:4411/${CI_PROJECT_PATH}.git
- echo "Fetching all branches..."
- git fetch --all
- echo "Checking out patched_master..."
- echo "Resetting patched_master to patched_changes..."
- git checkout patched_master
- echo "Merging master into patched_master, favoring patched_changes..."
- git merge -s recursive -X theirs origin/master
- echo "Cleaning up after merge..."
- git add .
- echo "Committing resolved merge..."
- git commit -m "Auto-resolve merge conflicts Favor patched_changes"
- echo "Pushing changes to patched_master..."
- git push origin patched_master
- git reset --hard origin/patched_changes
- echo "Force-pushing patched_master to match patched_changes..."
- git push origin patched_master --force