diff --git a/.gitconfig b/.gitconfig
index cfc2c0a..587d8e5 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -33,3 +33,5 @@
 	required = true
 [init]
 	defaultBranch = master
+[branch]
+	autoSetupMerge = simple