after nbdev_install_hooks

VorGeo · May 24, 2024 · b9c8076 · b9c8076
1 parent 4d4885c
commit b9c8076
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,4 @@
 # GitHub syntax highlighting
 pixi.lock linguist-language=YAML
 
+*.ipynb merge=nbdev-merge
diff --git a/.gitconfig b/.gitconfig
@@ -0,0 +1,11 @@
+# Generated by nbdev_install_hooks
+#
+# If you need to disable this instrumentation do:
+#   git config --local --unset include.path
+#
+# To restore:
+#   git config --local include.path ../.gitconfig
+#
+[merge "nbdev-merge"]
+	name = resolve conflicts with nbdev_fix
+	driver = nbdev_merge %O %A %B %P