From ebcf88c8701a87dcc9933691cc59a7aa34665bc2 Mon Sep 17 00:00:00 2001
From: 403-html <tymoteusz.stepien@wp.pl>
Date: Sun, 30 Jan 2022 14:10:54 +0100
Subject: [PATCH 1/2] chore: add merging main branch to pr

---
 .github/workflows/pr-semver.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pr-semver.yml b/.github/workflows/pr-semver.yml
index e4ad034..f8ebde8 100644
--- a/.github/workflows/pr-semver.yml
+++ b/.github/workflows/pr-semver.yml
@@ -10,12 +10,16 @@ jobs:
     if: ${{ github.event.label.name == 'semver' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-
-      - name: reattach HEAD
+      - name: Reattach HEAD
         uses: actions/checkout@v2
         with:
           ref: ${{ github.event.pull_request.head.ref }}
+          fetch-depth: 0
+
+      - name: Merge main branch to PR branch
+        uses: pr-mpt/actions-merge-branch@v2
+        with:
+          from: "origin/main"
 
       - name: Get current prefix
         id: branch-prefix
@@ -30,6 +34,7 @@ jobs:
             exit 1
           fi
           echo "Branch prefix is valid"
+
       - name: Set next version number based on prefix
         run: |
           echo "Getting next version number..."
@@ -46,11 +51,13 @@ jobs:
             echo "Error: working branch prefix not found"
             exit 1
           fi
+
       - name: Setup git
         run: |
           echo "Setting up git..."
           git config --global user.email "${{ secrets.MY_EMAIL }}"
           git config --global user.name "${{ secrets.MY_USERNAME }}"
+
       - name: Commit and push changes to working branch
         run: |
           echo "Committing changes..."

From 8a23f6febca536503f18de5df2ec47f69620da4d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 30 Jan 2022 13:15:02 +0000
Subject: [PATCH 2/2] chore(release): Bump patch version

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

diff --git a/package-lock.json b/package-lock.json
index d139c63..faf5af2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "mochawesome-json-to-md",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "mochawesome-json-to-md",
-      "version": "0.6.1",
+      "version": "0.6.2",
       "license": "MIT",
       "dependencies": {
         "yargs": "^17.0.1"
diff --git a/package.json b/package.json
index a05c279..842ab34 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mochawesome-json-to-md",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "A repository containing a script to convert JSON reports generated by MochAwesome to Mardown",
   "main": "index.js",
   "bin": {