Fix CI merge formatting test. (#231)

Fixes #230. We set the user name and email and a commit message in case a merge commit needs to be created.
kudobuilder · May 23, 2019 · 19e72de · 19e72de
1 parent ef19537
commit 19e72de
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -59,7 +59,10 @@ jobs:
           keys:
             - go-mod-v1-{{ checksum "go.sum" }}
 
-      - run: git merge origin/master
+      - run: |
+          git config user.name "Circle CI"
+          git config user.email "ci@mesosphere.com"
+          git merge -m "Merge Commit" origin/master
       - run: make check-formatting
       - save_cache:
           key: go-mod-v1-{{ checksum "go.sum" }}