Felitendo
abae8e0804
the code is ours now. ios/ is no longer framed as a tracking branch: there is no routine merge, no expectation that our tree resembles upstream's, and no reason to shape a change around a future merge. upstream stays pinned. .upstream-sync.json keeps recording the last commit folded in, so an on-request sync has somewhere to diff from — it gains mode: "hard-fork" to say what it is and is not. syncs happen when asked, and cherry-picking the wanted commits is now the default advice over a wholesale merge, since the trees have diverged by design. sync-upstream.sh no longer reports being "behind upstream" as though it were a defect, and apply-rebrand.sh is documented as what it now is: a no-op on a normal day, load-bearing right after a sync. the FEATHER_* xcconfig variables stay upstream-equal. renaming them is a defensible hard-fork cleanup, but they are referenced from both pbxproj files and both dev-repo workflows, and nothing here can verify a build — noted as an ask-first change instead. this changes the workflow, not the licence. every gpl-3.0 attribution to feather stays: the credits in AboutView, the app-repo news entry, the readme acknowledgements, the copyright headers.
16 lines
857 B
JSON
16 lines
857 B
JSON
{
|
|
"mode": "hard-fork",
|
|
"upstream": {
|
|
"repo": "https://github.com/claration/Feather.git",
|
|
"remote": "upstream",
|
|
"branch": "main"
|
|
},
|
|
"lastMerged": {
|
|
"commit": "2320fd752864adaa9a173f9fc2f64ee9241e979e",
|
|
"commitDate": "2026-05-24T15:54:32-07:00",
|
|
"upstreamVersion": "2.8.2",
|
|
"syncedAt": "2026-05-30"
|
|
},
|
|
"notes": "FTStore is a HARD FORK of Feather: ios/ is our codebase and does not track upstream continuously. This file stays as the pin — it records the last upstream commit folded in, so an on-request sync knows where to diff from. Syncs happen only when asked, via scripts/sync-upstream.sh; bump lastMerged when one is committed. Hard fork changes the workflow, NOT the licence: GPL-3.0 attribution to Feather stays intact everywhere. Brand transform lives in scripts/apply-rebrand.sh and applies to ios/ only."
|
|
}
|