Merge pull request conda#681 from maresb/update-git-ignore

Update .gitignore for pixi
maresb · Sep 6, 2024 · 9026d25 · 9026d25
2 parents 4c827ea + 89d7283
commit 9026d25
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -5,3 +5,5 @@
 *.ico binary
 # Treat vendor folder as vendored and generated
 conda_lock/_vendor/** linguist-vendored linguist-generated
+# GitHub syntax highlighting
+pixi.lock linguist-language=YAML linguist-generated=true
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,7 @@ site/
 filelock
 .coverage
 .micromamba/
+.pixi/
+# Make ad-hoc experimentation easier; remove these once we settle on a config
+pixi.lock
+pixi.toml