Skip to content

Rebase Tailscale onto latest upstream/dev (for #2270) - #25

Draft
joei4cm wants to merge 6 commits into
mainfrom
cursor/rebase-tailscale-dev-7840
Draft

Rebase Tailscale onto latest upstream/dev (for #2270)#25
joei4cm wants to merge 6 commits into
mainfrom
cursor/rebase-tailscale-dev-7840

Conversation

@joei4cm

@joei4cm joei4cm commented Aug 3, 2026

Copy link
Copy Markdown
Owner

Rebases the Tailscale feature onto the latest chen08209/FlClash dev tip and force-updates feat/tailscale so upstream PR chen08209#2270 is no longer conflicting.

Result

  • Upstream #2270: MERGEABLE / CLEAN
  • Compare vs dev: 1 ahead, 0 behind, 28 files (Tailscale-only)

What changed

  • Cherry-picked the Tailscale-only commit onto current upstream dev (e673b1e)
  • Dropped the diverged android-process / cache history that caused conflicts
  • Regenerated Riverpod output so TailscaleSetting.runBuild matches the current generator (WhenComplete)
  • Force-pushed feat/tailscalef00235d

Verification

  • flutter analyze --no-fatal-infos — clean
  • flutter test test/models/ test/providers/ — all passed (209)
Open in Web Open in Cursor 

chen08209 and others added 6 commits August 2, 2026 11:23
Optimize core service

Fix some issues

Optimize more details
Inject Tailscale proxies, route rules, and fake-IP filters into the
generated Clash config when enabled. Includes Tools → Features entry,
node management UI, localization, and provider/model tests.

Rebased onto upstream/dev (Adjust android process).

Co-authored-by: MichaelZ <joei4cm@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants