forked from CodeSculptor/SmarterTube
-
-
Notifications
You must be signed in to change notification settings - Fork 0
Upstream sync 2026-08-30 — manual merge needed #11
Copy link
Copy link
Open
Labels
conflictRequires manual conflict resolutionRequires manual conflict resolutionupstream-syncAutomated upstream synchronizationAutomated upstream synchronization
Description
Activity
Metadata
Metadata
Assignees
Labels
conflictRequires manual conflict resolutionRequires manual conflict resolutionupstream-syncAutomated upstream synchronizationAutomated upstream synchronization
An automatic merge of
upstream/masterconflicts with this fork'smaster.New upstream commits since last merge
Latest upstream tag:
notification2Conflicting paths
Next steps
Follow docs/upstream-merge.md for manual resolution. The 3 integration points from the rebase runbook (
stmobileflavor block insmarttubetv/build.gradleandcommon/build.gradle, plus theprotected setupViewManagerwidening inMainApplication) are the most likely conflict surfaces.Generated by .github/workflows/upstream-sync.yml