We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent b53a328 commit 930584bCopy full SHA for 930584b
.gitattributes
@@ -0,0 +1 @@
1
+*.ipynb merge=nbdev-merge
.gitconfig
@@ -0,0 +1,11 @@
+# Generated by nbdev_install_hooks
2
+#
3
+# If you need to disable this instrumentation do:
4
+# git config --local --unset include.path
5
6
+# To restore:
7
+# git config --local include.path ../.gitconfig
8
9
+[merge "nbdev-merge"]
10
+ name = resolve conflicts with nbdev_fix
11
+ driver = nbdev_merge %O %A %B %P
0 commit comments