doc: use union merge strategy for resolving conflicts in PendingRelea…

…seNotes Generally, the conflict resolution performed manually is always to do a union: automate this. This avoids pointless rebases of PRs. Signed-off-by: Patrick Donnelly <[email protected]>
ceph · Aug 29, 2020 · 048da58 · 048da58
1 parent ed90c07
commit 048da58
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,2 @@
 .githubmap merge=union
+PendingReleaseNotes merge=union