diff --git a/.github/workflows/r2s_lienol.yml b/.github/workflows/r2s_lienol.yml index 2489d86..e2d815c 100644 --- a/.github/workflows/r2s_lienol.yml +++ b/.github/workflows/r2s_lienol.yml @@ -94,6 +94,7 @@ jobs: git config --local user.email "action@github.com" && git config --local user.name "GitHub Action" git remote add upstream https://github.com/Lienol/openwrt && git fetch upstream git checkout upstream/dev-19.07 -b tmp + git revert 2202533d29c1494ad5645f87a7429e70f85a0110 git mv README.md README && git commit -m 'undo rename readme for rebasing' git checkout origin/master git rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto tmp -X theirs