fix: Corrected merge configuration

boxheed · Sep 18, 2024 · b1e8c71 · b1e8c71
1 parent 20e379b
commit b1e8c71
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -10,3 +10,5 @@ updates:
     schedule:
       interval: "weekly"
     target-branch: "develop"
+    commit-message:
+      prefix: "fix(deps)"