@@ -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
@@ -17,6 +17,7 @@ rules:
     options:
       - chore
       - ci
+      - dev
       - doc
       - feat
       - fix
-Original file line number
+Diff line change
     options:
       - chore
       - ci
 +      - dev
       - doc
       - feat
       - fix