From a9408847c61977a41c5c660232a3d3403e88e7d5 Mon Sep 17 00:00:00 2001
From: rumersdorfer <45141967+rumersdorfer@users.noreply.github.com>
Date: Thu, 20 Aug 2020 15:07:09 +0200
Subject: [PATCH] Update .gitattributes

---
 .gitattributes | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 544c336d0..711da2880 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -125,3 +125,10 @@ AUTHORS text
 # with the python modules ``pickle``, ``dbm.*``,
 # ``shelve``, ``marshal``, ``anydbm``, & ``bsddb``
 # (among others).
+
+
+# Mark compiled files as generated to hide them in PRs
+/dist/** linguist-generated=true
+
+# Hide compiled files from git diff and auto-replace them when merging different branches
+/dist/** -diff -merge