develop/rebase-32 -> build/rebase-32
convert-to-yml / develop-branch (push) Successful in 30s
Details
convert-to-yml / develop-branch (push) Successful in 30s
Details
This commit is contained in:
parent
db8afa4264
commit
589c209775
|
@ -46,7 +46,7 @@ jobs:
|
||||||
ls
|
ls
|
||||||
git log -5
|
git log -5
|
||||||
git status
|
git status
|
||||||
git rebase origin/master --strategy-option=theirs
|
git rebase -Xtheirs origin/master
|
||||||
ls
|
ls
|
||||||
git log -4
|
git log -4
|
||||||
git status
|
git status
|
||||||
|
|
Loading…
Reference in New Issue