diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
index e54df88c..c21e97cd 100644
--- a/.github/workflows/continuous_integration.yml
+++ b/.github/workflows/continuous_integration.yml
@@ -1,16 +1,15 @@
 name: CI
 
 on:
-  push:
-    branches: [master,v1]
   pull_request:
-    branches: [master,v1]
+    branches: [master]
   workflow_dispatch:
 
 jobs:
   build:
     name: Ruby ${{ matrix.ruby }} on ${{ matrix.operating-system }}
 
+    # Skip this job if triggered by a release PR
     if: >-
       github.event_name == 'workflow_dispatch' ||
       (github.event_name == 'pull_request' && !startsWith(github.event.pull_request.head.ref, 'release-please--'))
diff --git a/.github/workflows/experimental_continuous_integration.yml b/.github/workflows/experimental_continuous_integration.yml
index 44dc7889..488ab797 100644
--- a/.github/workflows/experimental_continuous_integration.yml
+++ b/.github/workflows/experimental_continuous_integration.yml
@@ -2,12 +2,19 @@ name: CI Experimental
 
 on:
   push:
-    branches: [master,v1]
+    branches: [master]
+
   workflow_dispatch:
 
 jobs:
   build:
     name: Ruby ${{ matrix.ruby }} on ${{ matrix.operating-system }}
+
+    # Skip this job if triggered by pushing a release commit
+    if: >-
+      github.event_name == 'workflow_dispatch' ||
+      (github.event_name == 'push' && !startsWith(github.event.head_commit.message, 'chore: release '))
+
     runs-on: ${{ matrix.operating-system }}
     continue-on-error: true
     env: { JAVA_OPTS: -Djdk.io.File.enableADS=true }
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index e28eff59..ada7355e 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "3.0.2"
+  ".": "3.1.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fec2948..5602c70e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,20 @@
 
 # Change Log
 
+## [3.1.0](https://github.com/ruby-git/ruby-git/compare/v3.0.2...v3.1.0) (2025-05-18)
+
+
+### Features
+
+* Make Git::Log support the git log --merges option ([df3b07d](https://github.com/ruby-git/ruby-git/commit/df3b07d0f14d79c6c77edc04550c1ad0207c920a))
+
+
+### Other Changes
+
+* Announce and document guidelines for using Conventional Commits ([a832259](https://github.com/ruby-git/ruby-git/commit/a832259314aa9c8bdd7719e50d425917df1df831))
+* Skip continuous integration workflow for release PRs ([f647a18](https://github.com/ruby-git/ruby-git/commit/f647a18c8a3ae78f49c8cd485db4660aa10a92fc))
+* Skip the experiemental build workflow if a release commit is pushed to master ([3dab0b3](https://github.com/ruby-git/ruby-git/commit/3dab0b34e41393a43437c53a53b96895fd3d2cc5))
+
 ## [3.0.2](https://github.com/ruby-git/ruby-git/compare/v3.0.1...v3.0.2) (2025-05-15)
 
 
diff --git a/lib/git/version.rb b/lib/git/version.rb
index 6831d2c1..0a293cc1 100644
--- a/lib/git/version.rb
+++ b/lib/git/version.rb
@@ -3,5 +3,5 @@
 module Git
   # The current gem version
   # @return [String] the current gem version.
-  VERSION='3.0.2'
+  VERSION='3.1.0'
 end