improve: remove merge conflict artifacts from .gitignore #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

Coding-Dev-Tools wants to merge 1 commit into main from improve/deploydiff-20260630

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -71,7 +71,6 @@ Thumbs.db @@
     research/
     fixtures/generated/
     .ruff_cache/
-    <<<<<<< Updated upstream
     .secrets.baseline
     # Merge artifacts and cache (added by workspace stabilization)
@@ Expand All / @@ -85,8 +84,6 @@ fixtures/generated/ @@
     *.REMOTE.*
     local.db
     *.sqlite3
-    =======
     # Added by release-prep
     node_modules
-    >>>>>>> Stashed changes