undo changes to both workflows (#4932)
This commit is contained in:
parent
f960e71a00
commit
e5e0c92f64
|
@ -41,9 +41,9 @@ jobs:
|
||||||
# merge, but don't commit the merge
|
# merge, but don't commit the merge
|
||||||
git merge --no-ff --no-commit best-wiki-git/master
|
git merge --no-ff --no-commit best-wiki-git/master
|
||||||
# unstage the file
|
# unstage the file
|
||||||
git reset HEAD .github/workflows/sync-wiki.yaml
|
git reset HEAD .github/workflows/sync-wiki2.yaml .github/workflows/sync-wiki3.yaml
|
||||||
# revert the file to its original state
|
# revert the file to its original state
|
||||||
git checkout -- .github/workflows/sync-wiki.yaml
|
git checkout -- .github/workflows/sync-wiki2.yaml .github/workflows/sync-wiki3.yaml
|
||||||
# commit the merge
|
# commit the merge
|
||||||
git commit -m "merge rusEFI wiki"
|
git commit -m "merge rusEFI wiki"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue