From 048da589238a0c92390d119854b4d927e1837d2e Mon Sep 17 00:00:00 2001
From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 28 Aug 2020 18:02:59 -0700
Subject: [PATCH] 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>
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
index 93a74fe40a6aa..3b377324cbd12 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 .githubmap merge=union
+PendingReleaseNotes merge=union