diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..87fed3d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+# SCM syntax highlighting & preventing 3-way merges
+pixi.lock merge=binary linguist-language=YAML linguist-generated=true linguist-vendored -diff
+
+yarn.lock text merge=union linguist-vendored linguist-generated
diff --git a/dev/commitlint.yml b/dev/commitlint.yml
index 73f4b2b..e628301 100644
--- a/dev/commitlint.yml
+++ b/dev/commitlint.yml
@@ -17,6 +17,7 @@ rules:
     options:
       - chore
       - ci
+      - dev
       - doc
       - feat
       - fix