From e2eaa0dae6c56edd88ec70bc8384f8eead210c35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gon=C3=A7alo=20Pereira?= <goncalo_pereira@outlook.pt>
Date: Wed, 17 Mar 2021 16:57:25 +0000
Subject: [PATCH] Set rebase as default conflit resolution method

---
 .gitconfig | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .gitconfig

diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 000000000..483b854ae
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,2 @@
+[pull]
+	rebase = true