From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sat, 29 Aug 2020 01:02:59 +0000 (-0700)
Subject: doc: use union merge strategy for resolving conflicts in PendingReleaseNotes
X-Git-Tag: v16.1.0~1286^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F36888%2Fhead;p=ceph.git

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 93a74fe40a6a..3b377324cbd1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 .githubmap merge=union
+PendingReleaseNotes merge=union