From 4bc1b1808cd6f4ab9571c3db6e9bd9e813236abd Mon Sep 17 00:00:00 2001 From: klever1988 <56048681+klever1988@users.noreply.github.com> Date: Mon, 30 Mar 2020 13:01:35 +0800 Subject: [PATCH] Update r2s_lienol_from_lean.yml --- .github/workflows/r2s_lienol_from_lean.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/r2s_lienol_from_lean.yml b/.github/workflows/r2s_lienol_from_lean.yml index a18189d..493a56f 100644 --- a/.github/workflows/r2s_lienol_from_lean.yml +++ b/.github/workflows/r2s_lienol_from_lean.yml @@ -123,6 +123,7 @@ jobs: git remote add upstream https://github.com/Lienol/openwrt && git fetch upstream git checkout upstream/dev-lean-lede -b tmp git mv README.md README && git commit -m 'undo rename readme for rebasing' + git checkout origin/master-v19.07.1 git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs git revert --no-edit f092ca098e80c667b10cdd1dba328506a2673c1d git checkout upstream/dev-lean-lede -- feeds.conf.default