chore: untrack 121 local artifact files that violate .gitignore#67
Merged
Conversation
Removes 121 files that were committed to main but match .gitignore rules: - .claude/settings.local.json — local Claude Code permissions - .claw/sessions/* — Claw session JSONL logs - .deepsec/* — DeepSec security scan output - .lynkr/telemetry.db-* — SQLite WAL/SHM files These directories are already listed in .gitignore but the files were added before the gitignore rule existed, so git kept tracking them. This commit untracks them with `git rm --cached -r` — the files stay on disk for any local tooling that needs them. Resolves the recurring merge conflicts every feature branch hits. Co-Authored-By: Claude Opus 4.7 (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
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.
Summary
.gitignorerules were added.claude/,.claw/sessions/,.deepsec/,.lynkr/.gitignore, so the files stay on disk for local tooling — only the tracking is removedWhy
Every new branch off
mainhits a merge conflict on.claude/settings.local.json(most recent: #66). The root cause is that these gitignored directories are still tracked inmain's tree, so each branch that touches them surfaces a conflict on next merge.This is a one-time
git rm --cached -rcleanup. No code changes.Test plan
git statusclean after commit (no staged additions, no untracked tracked files)git ls-tree -r HEAD --name-only | grep -E '^\.(claude|claw|deepsec|lynkr)/'returns nothing🤖 Generated with Claude Code