xxtheres
convert-to-yml / develop-branch (push) Successful in 32s
Details
convert-to-yml / develop-branch (push) Successful in 32s
Details
This commit is contained in:
parent
a405ad73c2
commit
42f52ee099
|
@ -46,7 +46,7 @@ jobs:
|
|||
echo rebasing with master
|
||||
git log -5
|
||||
git status
|
||||
git rebase origin/master --strategy-option ours
|
||||
git rebase -Xtheirs origin/master #--strategy-option ours
|
||||
echo no development branch so pushing
|
||||
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
|
||||
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea;
|
||||
|
|
Loading…
Reference in New Issue