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

rebase28
convert-to-yml / develop-branch (push) Successful in 32s Details

This commit is contained in:
gilesb 2023-10-23 18:33:23 +01:00
parent 236fe80ff7
commit eb9a8dc43f
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

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