[ISSUE apache#692]Change the default merge strategy to squash (apache…

…#695) * Change the default merge strategy to squash close apache#692
xwm1992 · Jan 6, 2022 · ee2f9ee · ee2f9ee
1 parent 7e59ecf
commit ee2f9ee
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 59 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -37,8 +37,8 @@ github:
     - microservice
     - state-management
   enabled_merge_buttons:
-    merge:   true
     squash:  true
+    merge:   true
     rebase:  false
   protected_branches:
     master:

diff --git a/eventmesh-common/src/test/java/org/apache/eventmesh/common/utils/ThreadUtilsTest.java b/eventmesh-common/src/test/java/org/apache/eventmesh/common/utils/ThreadUtilsTest.java