From e0e348eedf49f5f195f46e64d4caf34b5094b183 Mon Sep 17 00:00:00 2001
From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 10 Oct 2017 12:05:41 -0700
Subject: [PATCH] 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>
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

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