From d02e472d14eda62b24ec16bb679baa2bc3b986f6 Mon Sep 17 00:00:00 2001
From: Roy Lenferink <lenferinkroy@gmail.com>
Date: Wed, 19 Feb 2020 15:09:16 +0100
Subject: [PATCH] Updated GitHub merge settings (#4384)

---
 .asf.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.asf.yaml b/.asf.yaml
index 7f1c6ae70..c4a95f294 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -26,3 +26,7 @@ github:
     - distributed-tracing
     - service-mesh
     - dapper
+  enabled_merge_buttons:
+    squash:  true
+    merge:   false
+    rebase:  false