From b1e8c714c3fbc379ce42a5e8485f25b8ed35f336 Mon Sep 17 00:00:00 2001
From: Andrew Dunn <boxheed@users.noreply.github.com>
Date: Wed, 18 Sep 2024 22:26:09 +0000
Subject: [PATCH] fix: Corrected merge configuration

---
 .circleci/config.yml   | 2 +-
 .github/dependabot.yml | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 76a5b77..43c44c1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -46,7 +46,7 @@ jobs:
           command: source <(curl -s https://raw.githubusercontent.com/boxheed/shippable-scripts/master/java-build-ci-setup)
       - checkout
       - run: ./gradlew tagSemver
-      - run: git checkout develop && git merge $CIRCLE_BRANCH 
+      - run: "git checkout develop && git merge $CIRCLE_BRANCH -m \"fix(release): merge $CIRCLE_BRANCH into develop\" --no-ff"
       - run: git push --atomic origin $CIRCLE_BRANCH develop --tags
 
   publish:
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 1afe042..9881f5b 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -10,3 +10,5 @@ updates:
     schedule:
       interval: "weekly"
     target-branch: "develop"
+    commit-message:
+      prefix: "fix(deps)"
\ No newline at end of file