docs: add guide for resolving CHANGELOG.md conflicts using GitHub web editor (hiero-ledger#1601)

Signed-off-by: Siddhartha Ganguly <gangulysiddhartha22@gmail.com>
Signed-off-by: gangulysiddhartha22-cmyk <gangulysiddhartha22@gmail.com>
Signed-off-by: exploreriii <133720349+exploreriii@users.noreply.github.com>
Co-authored-by: exploreriii <133720349+exploreriii@users.noreply.github.com>

Author: gangulysiddhartha22-cmyk

CHANGELOG.md

@@ -25,6 +25,7 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 - Formatted client_test.py using Black.
 
 ### Added
+- Added guide for resolving CHANGELOG.md conflicts using GitHub's web editor (`#1591`)
 
 - Added Windows setup guide for SDK developers (`docs/sdk_developers/training/setup/setup_windows.md`) with PowerShell installation instructions. (#1570)
 - Added a beginner assignment guard that requires completion of a Good First Issue. (#1484)

docs/sdk_developers/merge_conflicts.md

@@ -7,7 +7,8 @@ Merge conflicts are caused by working on out-dated versions of the codebase, or
 ## Table of Contents
 
 - [Handling Conflicts](#handling-conflicts)
-- [Step by Step Guide to Resolve Merge Conflicts](#step-by-step-guide-to-resolve-merge-conflicts)
+- [Resolving CHANGELOG.md Conflicts Using GitHub's Web Editor](#resolving-changelogmd-conflicts-using-githubs-web-editor)
+- [Step-by-Step Guide to Resolve Merge Conflicts Locally](#step-by-step-guide-to-resolve-merge-conflicts-locally)
   - [1. See which files are conflicted](#1-see-which-files-are-conflicted)
   - [2. Understand what conflicts](#2-understand-what-conflicts)
   - [3. Decide what the final code should be](#3-decide-what-the-final-code-should-be)
@@ -24,13 +25,55 @@ Merge conflicts are caused by working on out-dated versions of the codebase, or
   - [Common issues](#common-issues)
   - [If you need to stop](#if-you-need-to-stop)
   - [What NOT to do](#what-not-to-do)
+  - [When to Use This Method](#when-to-use-this-method)
+  - [Steps](#steps)
 - [Recovery Tips](#recovery-tips)
   - [If you are completely stuck](#if-you-are-completely-stuck)
 - [Helpful Resources](#helpful-resources)
 
 
+## Resolving CHANGELOG.md Conflicts Using GitHub's Web Editor
 
-## Step by Step Guide to Resolve Merge Conflicts
+Changelog conflicts in CHANGELOG.md are very common in this repository because multiple pull requests frequently add new entries to the "Unreleased" section at the same time.
+
+For these conflicts, there is a much simpler alternative to the full local rebase process: you can resolve them directly in your Pull Request on GitHub using the built-in web editor. No local setup or force push is required.
+
+**Strong Recommendation**: Use the local VS Code rebase method (described below) to ensure full signing compliance. Use the web editor only if you are prepared to amend and re-sign the resolution commit locally afterward.
+
+### When to Use This Method
+
+- The conflict is only (or primarily) in `CHANGELOG.md`.
+- You want to keep both sets of changes — this is almost always the correct choice for changelogs, as they are designed to accumulate all entries over time.
+
+**Important**: The warnings above about not blindly accepting changes apply to code files. For CHANGELOG.md, "accepting both" is safe and recommended.
+
+### Steps
+
+1. In your PR, go to **Files changed** and scroll to the bottom. In the merge‑conflict banner, click **Resolve conflicts** to open the web editor.
+2. In GitHub's web-based editor:
+   - Conflicted sections are highlighted (usually in red/yellow).
+   - You'll see **Incoming change** (from main) and **Current change** (from your branch) marked in red/highlighted areas.
+
+3. **For a changelog conflict**:
+   - Click **Accept both** (if the button is available) — this combines all the bullet-point entries perfectly.
+   - If no "Accept both" button appears, manually remove the conflict markers (`<<<<<<< HEAD`, `=======`, `>>>>>>> your-branch`) and keep all entries from both sides.
+   - Optionally, sort or group similar entries for neatness.
+
+4. Once all conflicts are resolved, click **Mark as resolved** at the top of the editor.
+
+5. You'll see a **Sign off and Commit** section:
+   - Review your commit message
+   - Click **Commit merge** (or **Commit directly to...** depending on your GitHub UI).
+
+6. Your PR will update automatically, and the conflict will be resolved.
+
+This method is especially beginner-friendly and avoids the more advanced local rebase steps.
+
+For more details on GitHub's web-based editor, see: [The GitHub.dev web-based editor](https://docs.github.com/en/codespaces/the-githubdev-web-based-editor).
+**Example**: See [PR `#1589`](https://github.com/hiero-ledger/hiero-sdk-python/pull/1589) for a real example of resolving a CHANGELOG.md conflict using this method.
+
+
+## Step-by-Step Guide to Resolve Merge Conflicts Locally
 
 ### 1. See which files are conflicted
 ```bash