From d0d86f9bc5e6d3737433729c09945097b23b9bd0 Mon Sep 17 00:00:00 2001
From: Filipe Freire <livrofubia@gmail.com>
Date: Thu, 24 Mar 2022 12:20:24 +0000
Subject: [PATCH] Add git merge info to release-build. (#4628)

* Add git merge info to release-build.

* Improve spacing
---
 .github/workflows/changelog.yml     |  1 -
 .github/workflows/release-build.yml | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index 62f2c6b3b..b53d71f5a 100644
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -77,7 +77,6 @@ jobs:
           OWNER: ${{ github.repository_owner }}
           HEAD: release/${{ env.RELEASE_VERSION }}
           RELEASE_NAME: ${{ env.RELEASE_VERSION }}
-          SHOW_MISSING: ${{ env.SHOW_MISSING }}
 
       - name: Read changelog
         id: read-changelog
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index 23980ba99..f29575073 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -139,5 +139,23 @@ jobs:
             ```bash
             gh workflow run release-publish.yml -f version=${{ steps.release_version.outputs.version }} --repo ${{ github.repository }}
             ```
+
+            <details>
+            <summary>Conflicts? Merge branch step failed on the publish workflow? Try this...</summary>
+
+            Run locally:
+
+            ```bash
+            # Make sure git remote is Kong/insomnia...
+
+            git checkout develop
+            git merge --no-ff release/<replaced with version>
+
+            # Solve merge conflicts ...
+            # If there's package-lock conflicts, run `npm run bootstrap` and commit the package-lock changes
+
+            git push
+            ```
+            </details>
           destination_branch: develop
           github_token: ${{ secrets.GITHUB_TOKEN }}