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

rebase31

This commit is contained in:
gilesb 2023-10-23 18:45:00 +01:00 committed by giles
parent 2c9853613b
commit e4e5fa3bb7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,11 +44,11 @@ jobs:
run: | run: |
if [[ $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then if [[ $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
ls ls
git log -5 git log -20
git status git status
git rebase origin/master --strategy-option=ours git rebase origin/master --strategy-option=ours
ls ls
git log -5 git log -20
git status git status
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 }};