From d3b84a8f7707ad770c7796042ee92049eb8c4830 Mon Sep 17 00:00:00 2001
From: Harrison Deng <yunyangdeng@gmail.com>
Date: Mon, 10 Jan 2022 03:57:25 -0600
Subject: [PATCH] Jenkins pipeline will use auto generated merge commit now.

---
 Jenkinsfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b14ab45..fdf1e4b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,9 +31,8 @@ pipeline {
                 }
                 sh 'git clean -fd'
 
-                sh 'git merge --strategy-option theirs --no-commit origin/delta'
+                sh 'git merge --strategy-option theirs origin/delta'
                 sh 'git tag -a "L$VER_MAJOR.$VER_MINOR.$VER_PATCH" -m "Automatic publish performed by Jenkins."'
-                sh 'git commit -am "Automatically merged delta branch to master." || exit 0'
                 sshagent(['2e60e630-b240-4c78-87ce-cb2c33d70180']) {
                     sh 'git push origin master'
                     sh 'git push origin --tags'