From f6e0c274a19691c1a8c3af658e447cd77aa3dcef Mon Sep 17 00:00:00 2001 From: Richard Hope Date: Sat, 1 Aug 2026 10:52:04 +1000 Subject: [PATCH] chore: untrack machine-local dotfiles swept into main by #297 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) --- .bash_profile | 0 .bashrc | 0 .gitconfig | 0 .gitignore | 15 ++++++++++++++- .gitmodules | 0 .idea | 0 .mcp.json | 0 .profile | 0 .ripgreprc | 0 .zprofile | 0 .zshrc | 0 11 files changed, 14 insertions(+), 1 deletion(-) delete mode 100644 .bash_profile delete mode 100644 .bashrc delete mode 100644 .gitconfig delete mode 100644 .gitmodules delete mode 100644 .idea delete mode 100644 .mcp.json delete mode 100644 .profile delete mode 100644 .ripgreprc delete mode 100644 .zprofile delete mode 100644 .zshrc diff --git a/.bash_profile b/.bash_profile deleted file mode 100644 index e69de29..0000000 diff --git a/.bashrc b/.bashrc deleted file mode 100644 index e69de29..0000000 diff --git a/.gitconfig b/.gitconfig deleted file mode 100644 index e69de29..0000000 diff --git a/.gitignore b/.gitignore index ea5689a..20bf787 100644 --- a/.gitignore +++ b/.gitignore @@ -53,4 +53,17 @@ website/site/ .zensical/ #Claude -.claude/ \ No newline at end of file +.claude/ +# Machine-local shell/IDE/agent dotfiles that appear (empty) at the worktree +# root on some dev setups — never repo content. Accidentally swept into #297 +# by a broad `git add -A`; keep them untracked. +.bash_profile +.bashrc +.gitconfig +.gitmodules +.idea +.mcp.json +.profile +.ripgreprc +.zprofile +.zshrc diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e69de29..0000000 diff --git a/.idea b/.idea deleted file mode 100644 index e69de29..0000000 diff --git a/.mcp.json b/.mcp.json deleted file mode 100644 index e69de29..0000000 diff --git a/.profile b/.profile deleted file mode 100644 index e69de29..0000000 diff --git a/.ripgreprc b/.ripgreprc deleted file mode 100644 index e69de29..0000000 diff --git a/.zprofile b/.zprofile deleted file mode 100644 index e69de29..0000000 diff --git a/.zshrc b/.zshrc deleted file mode 100644 index e69de29..0000000