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:03:44 +01:00 committed by giles
parent 3f3ada6b26
commit e2b24a9dab
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

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