Added ability to merge branches manually via an action.

.github/workflows/manual-merge-branches.yml

@@ -0,0 +1,27 @@
+name: Merge branches (manual)
+
+on:
+  workflow_dispatch:
+    inputs:
+     sourceBranch:
+        description: 'Source branch'
+        required: false
+        default: 'master'
+     targetBranch:
+        description: 'Target branch'
+        required: false
+        default: 'release'
+
+jobs:
+  sync-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Merge master -> release
+        uses: devmasx/merge-branch@master
+        with:
+          type: now
+          from_branch: ${{ inputs.sourceBranch }}
+          target_branch: ${{ targetBranch.sourceBranch }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}    

.github/workflows/manual.yml → .github/workflows/manual-release.yml

@@ -1,4 +1,4 @@
-name: Manual
+name: Manual release
 
 on:
   workflow_dispatch:

MFiles.VAF.Extensions.sln

@@ -20,7 +20,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Actions", "Actions", "{4424
 	ProjectSection(SolutionItems) = preProject
 		.github\workflows\build-and-publish.yml = .github\workflows\build-and-publish.yml
 		.github\workflows\build.yml = .github\workflows\build.yml
-		.github\workflows\manual.yml = .github\workflows\manual.yml
+		.github\workflows\manual-release.yml = .github\workflows\manual-release.yml
+		.github\workflows\manual-merge-branches.yml = .github\workflows\manual-merge-branches.yml
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DB025D1F-EAB3-42A6-B49C-1C9917C11ED0}"