Mintlify-inspired templates: 9→3 consolidation (re-merge, lockfile fixed) - #9
Closed
CharanMN7 wants to merge 1 commit into
Closed
Mintlify-inspired templates: 9→3 consolidation (re-merge, lockfile fixed)#9CharanMN7 wants to merge 1 commit into
CharanMN7 wants to merge 1 commit into
Conversation
npm ci was failing (EUSAGE) because package-lock.json wasn't regenerated after the 9→3 template consolidation: it still listed the 8 now-archived templates as workspaces and was missing the two new live ones (@inkform/theme-galley, @inkform/theme-shadcn).
Contributor
Author
|
Superseded by a corrected re-land: reverting a merge and later trying to re-merge the same branch confuses git's merge-base (classic 'revert a faulty merge' gotcha) — GitHub correctly flagged this as CONFLICTING. Redone properly in a follow-up PR: revert-the-revert first, then merge phase 6 (with the lockfile fix) on top. |
7 tasks
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
1 participant
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.
Re-opens the work from #7, which was merged then reverted (#8) because CI failed on a stale lockfile (
npm ciEUSAGE: package-lock.json still listed the 8 archived templates and was missing@inkform/theme-galley/@inkform/theme-shadcn).This branch now includes a lockfile-sync fix on top of the original phase 6 work. Content is otherwise identical to #7 — verified the revert (#8) was an exact inverse of the #7 merge diff before redoing this.
Test plan
npm cisucceeds locally (previously failed with EUSAGE)