From 3bb6c41212bf21b7908928b87d869cc36307d630 Mon Sep 17 00:00:00 2001
From: Henry Mercer <henrymercer@github.com>
Date: Wed, 11 May 2022 10:50:13 +0100
Subject: [PATCH 1/2] Remove an extraneous commit during the release process

We only need to run `git commit` after the `git merge` call if there were conflicts.
---
 .github/update-release-branch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/update-release-branch.py b/.github/update-release-branch.py
index 70cc31872..c5f5c1dbb 100644
--- a/.github/update-release-branch.py
+++ b/.github/update-release-branch.py
@@ -292,7 +292,7 @@ def main():
     conflicted_files = run_git('diff', '--name-only', '--diff-filter', 'U').splitlines()
     if len(conflicted_files) > 0:
       run_git('add', '.')
-    run_git('commit', '--no-edit')
+      run_git('commit', '--no-edit')
 
     # Migrate the package version number from a v2 version number to a v1 version number
     print(f'Setting version number to {version}')

From daf6560612eadb8805cd5cf77b4be5566c7900d0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions@github.com>
Date: Wed, 11 May 2022 10:57:56 +0000
Subject: [PATCH 2/2] Update changelog and version after v2.1.10

---
 CHANGELOG.md      | 4 ++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 104a16513..66c1b0cd3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CodeQL Action Changelog
 
+## [UNRELEASED]
+
+No user facing changes.
+
 ## 2.1.10 - 10 May 2022
 
 - Update default CodeQL bundle version to 2.9.5. [#1056](https://github.com/github/codeql-action/pull/1056)
diff --git a/package-lock.json b/package-lock.json
index 203a1cdee..a580b9e53 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "codeql",
-  "version": "2.1.10",
+  "version": "2.1.11",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "codeql",
-      "version": "2.1.10",
+      "version": "2.1.11",
       "license": "MIT",
       "dependencies": {
         "@actions/artifact": "^1.0.0",
diff --git a/package.json b/package.json
index 20267c449..2782c8c3d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codeql",
-  "version": "2.1.10",
+  "version": "2.1.11",
   "private": true,
   "description": "CodeQL action",
   "scripts": {