docs: backport live-docs ef3649d3d to master - #3691
Closed
start9-docs-bot[bot] wants to merge 1 commit into
Closed
Conversation
Both "Github release page" links in installing-startos.md name start-os/v0.4.0.2, which has no tag and no release, so the two entry points to downloading StartOS — the USB installer and the Raspberry Pi image — both 404 on docs.start9.com. 0.4.0.2 is the prospective next version, and #3616 carried the docs links along with the bump. The rest of that bump is correct: root package.json and the CHANGELOG heading are supposed to name the version being accumulated. A user-facing "find the latest version" link is not — it has to name a release that has actually been cut, which is 0.4.0.1. (cherry picked from commit d009d71)
dr-bonez
pushed a commit
that referenced
this pull request
Aug 12, 2026
…us PR (#3696) A PR merged into live-docs with the merge button puts a merge commit in the pushed range, and cherry-pick refuses one without -m ("is a merge but no -m option was given"). The step treats any nonzero exit as a conflict, so it opened a PR saying "resolve the conflicts before merging" against a branch with none, and the per-commit fallback loop then hit the same error and warned the merge was "not included" when its content was already there. It fired on every merge-commit push so far: #3657, #3691, #3695. Pick the first-parent list with -m 1, so a merged PR is one patch: the merge's own net change. -m 1 is a no-op on a non-merge, so squash-merge pushes are unaffected. Two smaller corrections in the same step, both observed on those PRs: the conflict wording now belongs to the conflict reason alone rather than to every unexpected failure, and a branch whose conflicts were resolved by keeping the markers now names those files in the body — #3657 shipped 130 markers across 14 files, including start-sdk's StartSdk.ts, and GitHub still reported it mergeable.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automated backport of the documentation change published to docs.start9.com from
live-docs(ef3649d).It could not be applied to master unattended — resolve the conflicts before merging.
Until this lands, master's copy of the docs is out of step and the next tag will revert the published fix.
Warning
These commits could not be carried onto this branch at all and are not included. Apply them by hand:
ef3649d3dMerge pull request fix(docs): point the install links at 0.4.0.1, the release that exists #3690 from Start9Labs/fix/docs-latest-release-link