Git
2 articles about "Git".
git worktree plus a junctioned node_modules: how we broke our shared dependencies, and how we stop it now
On Windows, if a git worktree's node_modules is a mklink /J junction back to the main checkout, git worktree remove follows the junction and empties the main copy. We hit this four times between early September and mid October. Retesting this week: it happens without --force too, and running npm ci inside the junction also empties the main copy. Includes our cleanup order and a check script.
Merging 106 commits into a branch that had been open for two and a half weeks: how we sorted and resolved 44 conflicts
The MindThread 2.0 branch went a week without syncing, mainline grew by 106 commits, and the merge stopped on 44 conflicted files. We sorted them into four groups (shared code, old-only, new-only, config), gave each group a default rule, then ran two test stages, held the bundle budget and walked the preview site. Includes a conflict sorting script and a by-key three-way JSON merge script.