From a1bbc6f8ba2fb0564b554e43f3edf5c5f44f43b5 Mon Sep 17 00:00:00 2001
From: megaproxy <megaproxy@gmail.com>
Date: Sat, 9 May 2026 16:05:55 +0100
Subject: [PATCH] Enforce LF line endings via .gitattributes + ignore
 tauri-icon's extra outputs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes the recurring 'Your local changes to Cargo.toml would be overwritten'
error on Windows pulls. Git-for-Windows defaults to core.autocrlf=true,
which made every text file appear modified vs the LF-stored versions.
'* text=auto eol=lf' in .gitattributes overrides autocrlf and forces a
stable LF checkout.

Also ignores Square*Logo.png, android/, ios/, 64x64.png, icon.png — these
are produced by 'pnpm tauri icon' but we ship only the canonical 5 files
(32, 128, 128@2x, .ico, .icns).
---
 .gitattributes | 42 ++++++++++++++++++++++++++++++++++++++++++
 .gitignore     |  9 +++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..b94f291
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,42 @@
+# Always check out source files with LF endings, regardless of the user's
+# core.autocrlf setting. Without this, Windows clones with core.autocrlf=true
+# (the Git-for-Windows default) treat every text file as "modified" because
+# Git's stored version is LF but the working copy is CRLF.
+
+* text=auto eol=lf
+
+# Explicit text files (belt-and-suspenders).
+*.rs       text eol=lf
+*.toml     text eol=lf
+*.json     text eol=lf
+*.ts       text eol=lf
+*.tsx      text eol=lf
+*.js       text eol=lf
+*.svelte   text eol=lf
+*.css      text eol=lf
+*.html     text eol=lf
+*.md       text eol=lf
+*.yml      text eol=lf
+*.yaml     text eol=lf
+
+# Shell + Windows scripts keep their native endings.
+*.sh       text eol=lf
+*.ps1      text eol=crlf
+*.bat      text eol=crlf
+*.cmd      text eol=crlf
+
+# Binaries — never touch these.
+*.png      binary
+*.ico      binary
+*.icns     binary
+*.jpg      binary
+*.jpeg     binary
+*.gif      binary
+*.exe      binary
+*.dll      binary
+*.so       binary
+*.dylib    binary
+*.woff     binary
+*.woff2    binary
+*.ttf      binary
+*.otf      binary
diff --git a/.gitignore b/.gitignore
index d370359..6fe985b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,15 @@ src-tauri/Cargo.lock
 *.tsbuildinfo
 .vite/
 
+# Extra outputs from `pnpm tauri icon` — we ship only the canonical set
+# (32x32.png, 128x128.png, 128x128@2x.png, icon.ico, icon.icns).
+src-tauri/icons/64x64.png
+src-tauri/icons/icon.png
+src-tauri/icons/Square*.png
+src-tauri/icons/StoreLogo.png
+src-tauri/icons/android/
+src-tauri/icons/ios/
+
 # Agent working files — meaningful to local Claude Code sessions, noise for
 # anyone else. Kept out of the public repo (they still live on disk).
 CLAUDE.md