doc: use union merge strategy for resolving conflicts in PendingReleaseNotes

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 <pdonnell@redhat.com>

diff --git a/.gitattributes b/.gitattributes
index 93a74fe40a6aaf39f7edbf3197f7125cb9c53cb3..3b377324cbd120dfb0dbb8551f6cc7f7718ce91c 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 .githubmap merge=union
+PendingReleaseNotes merge=union