From 189fffc3f84cdded7f7239b75beddca9faca2fc5 Mon Sep 17 00:00:00 2001
From: Jesper Dramsch <jesper.dramsch@ecmwf.int>
Date: Thu, 12 Sep 2024 13:13:53 +0000
Subject: [PATCH] chore: git stuff

---
 .gitattributes | 1 +
 .gitignore     | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..a19ade0
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG.md merge=union
diff --git a/.gitignore b/.gitignore
index a347378..8956403 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@ _build/
 ?
 ?.*
 ~*
+
+# Environments
+.envrc