From 72dbddc878e0817bdbbde6e3bc41177d2d3302b0 Mon Sep 17 00:00:00 2001
From: Pavindu Lakshan <pavindu@wso2.com>
Date: Tue, 11 Jun 2024 15:09:43 +0530
Subject: [PATCH] Update TROUBLESHOOTING.md

---
 docs/TROUBLESHOOTING.md | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/docs/TROUBLESHOOTING.md b/docs/TROUBLESHOOTING.md
index f19571b4663..efafcbbbe65 100644
--- a/docs/TROUBLESHOOTING.md
+++ b/docs/TROUBLESHOOTING.md
@@ -4,14 +4,38 @@ Look through here if you come across any issue.
 
 ✨ If your issues isn't here and you were able to figure a solution, please consider contribute to the guide.
 
+* [Changesets](#changesets)
 * [Node](#node)
   * [Dev Server Failures](#dev-server-failures)
     * [File watchers exceed error](#file-watchers-exceed-error)
   * [Package Install Failures](#package-install-failures)
-    * [Global npm package install errors on Mac System](#global-npm-package-install-errors-on-mac-ystem)
+    * [Global npm package install errors on Mac System](#global-npm-package-install-errors-on-mac-system)
 * [Maven](#maven)
   * [Build Failures](#build-failures)
 
+## Changesets
+
+### Failed to find where HEAD diverged from master
+
+You may sometimes see the following error when trying to generate changeset on your feature branch.
+
+```
+❯ pnpm changeset
+🦋  error Error: Failed to find where HEAD diverged from master. Does master exist?
+```
+
+**How to fix:**
+
+1. First you need to checkout to master branch.
+`git checkout master`
+
+2. Then get the latest changes from upstream.
+`git pull upstream master`
+
+3. Rebase the feature branch on master branch, and try generating changesets again.
+`git checkout <your_feature_branch>`
+`git rebase master`
+
 ## Node
 
 ### Dev Server Failures