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

rebase32
build-develop-branch / build-branch (push) Successful in 35s Details

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

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

@ -44,11 +44,11 @@ jobs:
run: |
if [[ $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
ls
git log -20
git log -5
git status
git rebase origin/master --strategy-option=ours
git rebase origin/master --strategy-option=theirs
ls
git log -20
git log -4
git status
echo no development branch so pushing
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};