docs: add guide for resolving CHANGELOG.md conflicts using GitHub web editor

[gangulysiddhartha22-cmyk]

Description:
Adds a new section to the merge conflicts guide explaining how to resolve common CHANGELOG.md conflicts directly in GitHub's web editor.

Related issue(s):

Fixes #1591

Notes for reviewer:
This is a documentation improvement with no code changes.

Checklist

• Documented (Code comments, README, etc.)

[coderabbitai]

Walkthrough

Adds an Unreleased CHANGELOG.md entry and expands docs/sdk_developers/merge_conflicts.md by adding a subsection on resolving CHANGELOG.md conflicts via GitHub's web editor and a reorganized, expanded local (VS Code) conflict-resolution guide; the web-editor guidance is duplicated.

Changes

Cohort / File(s)	Summary
Changelog Entry CHANGELOG.md	Added an "Unreleased → Added" entry: "Added guide for resolving CHANGELOG.md conflicts using GitHub's web editor (#1591)." (+1/-0)
Merge Conflicts Documentation docs/sdk_developers/merge_conflicts.md	Replaced single ToC entry with two entries; added "Resolving CHANGELOG.md Conflicts Using GitHub's Web Editor" subsection with step-by-step web-editor instructions; added/expanded "Step-by-Step Guide to Resolve Merge Conflicts Locally" with VS Code–focused workflow, signing and force-push notes. Note: web-editor guidance appears twice. (+45/-2)

Sequence Diagram(s)

(omitted)

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Title check	✅ Passed	The PR title clearly and concisely describes the main change: adding a guide for resolving CHANGELOG.md conflicts using GitHub's web editor, which is the primary objective of this documentation PR.
Description check	✅ Passed	The PR description accurately relates to the changeset, explaining that it adds a new section to the merge conflicts guide for resolving CHANGELOG.md conflicts in GitHub's web editor, and references the related issue #1591.
Linked Issues check	✅ Passed	The PR fulfills the core objectives from issue #1591: adding a new section to merge_conflicts.md explaining how to resolve CHANGELOG.md conflicts using GitHub's web editor, with steps and guidance. A CHANGELOG.md entry was also added as required.
Out of Scope Changes check	✅ Passed	The changes are limited to the requested scope: adding a new section on web-editor-based CHANGELOG.md conflict resolution and expanding local resolution guidance in merge_conflicts.md, plus a single CHANGELOG.md entry. No unrelated modifications are present.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[coderabbitai]

Actionable comments posted: 2

[coderabbitai]

Actionable comments posted: 4

♻️ Duplicate comments (1)

docs/sdk_developers/merge_conflicts.md (1)

231-231: Fix capitalization: "GitHub.dev" not "github.dev".

The official name of the GitHub web-based editor is "GitHub.dev" with a capital "H".

✏️ Capitalization fix

-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).
+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).

[coderabbitai]

Actionable comments posted: 1

♻️ Duplicate comments (1)

docs/sdk_developers/merge_conflicts.md (1)

200-209: Fix markdown list numbering to maintain continuity.

The code block at lines 203-207 breaks the numbered list sequence. Markdown requires code blocks within lists to be indented with 3 spaces (or use fenced code blocks with proper indentation) to maintain list continuity. Without this, steps 3-9 will render as a separate list starting from 1.

📝 Proposed fix to maintain list numbering

 2. Find the conflicted CHANGELOG.md file. You'll see a preview of the conflict with markers, often looking like this:
-<<<<<<< HEAD
-[Content from current branch/HEAD]
-=======
-[Content from incoming branch]
->>>>>>> [commit-hash-or-branch-name]
+
+   ```
+   <<<<<<< HEAD
+   [Content from current branch/HEAD]
+   =======
+   [Content from incoming branch]
+   >>>>>>> [commit-hash-or-branch-name]
+   ```
 
 3. Look for the online editor at the bottom of the PR file preview.

The key is indenting the code block with 3 spaces and wrapping it in fenced code block markers.

[coderabbitai]

Actionable comments posted: 2

♻️ Duplicate comments (1)

docs/sdk_developers/merge_conflicts.md (1)

231-231: Minor: Use official capitalization for GitHub.dev.

The official branding uses a capital "H": GitHub.dev rather than github.dev.

✏️ Proposed fix

-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).
+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).

As per coding guidelines, keeping feedback focused on correctness.

[gangulysiddhartha22-cmyk]

@exploreriii just one new section added to merge_conflicts.md. git diff confirms.
ready for review. Thanks!

[aceppaluni]

@gangulysiddhartha22-cmyk Thank you for your contribution!

LGTM!

Requesting further review from @hiero-ledger/hiero-sdk-python-triage

[exploreriii]

Great!
Can we make a couple of edits to make it even easier for new contributors?
Thank you!

[github-actions]

Hi, this is MergeConflictBot.
Your pull request cannot be merged because it contains merge conflicts.

Please resolve these conflicts locally and push the changes.

To assist you, please read:

• Resolving Merge Conflicts
• Rebasing Guide

Thank you for contributing!

[prajeeta15]

@gangulysiddhartha22-cmyk can you please make the requested edits and resolve the merge conflicts.

everything else looks good and ready to be merged :)

[gangulysiddhartha22-cmyk]

@exploreriii I made all the changes as you mentioned. Coincidentally, I got a merge conflict in the CHANGELOG.md file and solved it using the web editor. Please review. I'm always up for further modifications. Thank you very much!

[coderabbitai]

Actionable comments posted: 3

[coderabbitai]

Actionable comments posted: 1

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.

@@           Coverage Diff           @@
##             main    #1601   +/-   ##
=======================================
  Coverage   92.89%   92.89%           
=======================================
  Files         140      140           
  Lines        8765     8765           
=======================================
  Hits         8142     8142           
  Misses        623      623           

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

[coderabbitai]

Actionable comments posted: 4

[coderabbitai]

Actionable comments posted: 1

[prajeeta15]

LGTM! great work! thank you :)

[prajeeta15]

ready to merge. all issues resolved.

[exploreriii]

Thank you very much @gangulysiddhartha22-cmyk !

[github-actions]

🎉 Congratulations on completing a beginner/Good First Issue!

Thank you for your contribution to the Hiero Python SDK! We're excited to have you as part of our community.

Here are some similar issues you might be interested in working on next:

1. [Beginner]: Add Missing Type Hint to to_bytes Method in Transaction Class

   🐥 Beginner Friendly This issue is intended for contributors who have previously completed a Good First Issue in Hiero and are at a beginner level....

2. [Beginner]: Add Missing Type Hints to sign Method in Transaction Class

   🐥 Beginner Friendly This issue is intended for contributors who have previously completed a Good First Issue in Hiero and are at a beginner level....

3. [Beginner]: Implement __repr__ Method for TopicId Class

   🐥 Beginner Friendly This issue is intended for contributors who have previously completed a Good First Issue in Hiero and are at a beginner level....

4. [Beginner]: Implement __repr__ Method for FileId Class

   🐥 Beginner Friendly This issue is intended for contributors who have previously completed a Good First Issue in Hiero and are at a beginner level....

5. [Beginner]: Implement __repr__ Method for NftId Class

   🐥 Beginner Friendly This issue is intended for contributors who have previously completed a Good First Issue in Hiero and are at a beginner level....

🌟 Stay connected with the project:

• ⭐ Star this repository to show your support
• 👀 Watch this repository to get notified of new issues and releases

We look forward to seeing more contributions from you! If you have any questions, feel free to ask in our Discord community.

From the Hiero Python SDK Team 🚀