From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 10 Oct 2017 19:05:41 +0000 (-0700)
Subject: githubmap: define merge conflict resolution
X-Git-Tag: v13.0.1~616^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e0e348eedf49f5f195f46e64d4caf34b5094b183;p=ceph-ci.git

githubmap: define merge conflict resolution

Use "union" merge to automatically resolve trivial append merge conflicts from
using ptl-tool.py.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..93a74fe40a6
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+.githubmap merge=union