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

...

This commit is contained in:
gilesb 2023-10-23 16:19:21 +01:00 committed by giles
parent 7ea2a34e80
commit a051369401
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/develop -> build.yml
View File

@ -44,7 +44,7 @@ jobs:
git push origin HEAD:${{ env.BUILD_BRANCH }};
else
if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then
git rebase origin/${{ env.BUILD_BRANCH }} --strategy-option ours
git rebase origin/${{ env.BUILD_BRANCH }} --strategy-option theirs
git push origin HEAD:${{ env.BUILD_BRANCH }}
else
echo 'no changes so no push'