chore: untrack machine-local dotfiles swept into main by #297 - #298
Merged
Conversation
The conflict-resolution merge in #297 ran a broad `git add -A` at the worktree root and staged ten machine-local dotfiles (.zshrc, .gitconfig, .idea, …) as empty files; the merge carried them onto main. All ten were the empty blob, so nothing leaked — but they are not repo content, and on machines where these paths exist locally a tracked copy blocks every checkout/pull. Remove them from tracking and gitignore them so a future sweep cannot re-add them. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
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.
The conflict-resolution merge in #297 ran a broad
git add -Aat the worktree root and staged ten machine-local dotfiles (.zshrc,.gitconfig,.idea,.mcp.json, …) as empty files; the merge carried them onto main.All ten are the empty blob (
e69de29), so no configuration content leaked — but they are not repo content, and on machines where these paths exist locally a tracked copy blocks every checkout/pull with "untracked working tree files would be overwritten".This removes them from tracking (
git rm --cached, working copies untouched) and adds them to.gitignoreso a future broadadd -Acannot re-stage them.🤖 Generated with Claude Code