prefer ours for .github merges/rebases

pull/3512/head
Priyanka Bettadapura 1 month ago
parent fb6cc103f7
commit 3437580896
  1. 1
      .gitattributes

1
.gitattributes vendored

@ -0,0 +1 @@
.github/** merge=ours
Loading…
Cancel
Save