Add git config

AntoinePrv · AntoinePrv · commit a7b01d399650 · 2025-11-19T11:05:11.000+01:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+# SCM syntax highlighting & preventing 3-way merges
+pixi.lock merge=binary linguist-language=YAML linguist-generated=true
diff --git a/.gitignore b/.gitignore
@@ -46,4 +46,8 @@ docs/build/
 .cache/
 
 # CLion / IDEA
-.idea/
+.idea/
+
+# pixi environments
+.pixi/*
+!.pixi/config.toml

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# SCM syntax highlighting & preventing 3-way merges`
	`2`	`+pixi.lock merge=binary linguist-language=YAML linguist-generated=true`