another-user
/
batch-example
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 143 Wiki Activity

xxtheres

This commit is contained in:
gilesb 2023-10-23 17:43:06 +01:00 committed by giles
parent aac5893454
commit 867f7756a3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitea/workflows/build->develop.yml
View File

@ -46,7 +46,7 @@ jobs:
echo rebasing with master echo rebasing with master
git log -5 git log -5
git status git status
git rebase origin/master --strategy-option ours git rebase -Xtheirs origin/master #--strategy-option ours
echo no development branch so pushing echo no development branch so pushing
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}; git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea; curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea;