[RomanNikitenko]

What does this PR do?

• The chain had two identical elif branches for code/extensions/mermaid-markdown-features/package.json, both routing to apply_package_changes_by_path. The first match always wins, so the second entry was dead code.
• Verified it is the only duplicate in the chain (92 entries remain, each with its rule files); the rules test suite passes with the same verdict as before (78 passed, 15 known cosmetic warnings, 0 failed).

What issues does this PR fix?

How to test this PR?

Does this PR contain changes that override default upstream Code-OSS behavior?

• the PR contains changes in the code folder (you can skip it if your changes are placed in a che extension )
• the corresponding items were added to the CHANGELOG.md file
• rules for automatic git rebase were added to the .rebase folder

Summary by CodeRabbit

• Chores
  • Removed a duplicate conflict-handling path; the existing handling remains in place.
  • No changes to user-facing features or behavior.

[github-actions]

Click here to review and test in web IDE:

[coderabbitai]

No actionable comments were generated in the recent review.

Recent review info

Run configuration

• Source mode: Auto
• Repository: che-incubator/che-code
• Branch: main
• File: .coderabbit.yaml
• Commit: a51be0e
• Layers: Repository YAML
• Review profile: CHILL
• Plan: Advanced
• Run ID: 71ae222c-7855-46e9-8a51-64891d6679e0

Commits

Reviewing files that changed from the base of the PR and between a51be0e and 065d3d6.

Files selected for processing: 1

• rebase.sh

Files with no reviewable changes: 1

• rebase.sh

Included review availability: This review used your included allowance. Your plan provides up to 1 included review per hour; 0 remain after this review.

Walkthrough

The change removes a second mermaid-markdown-features/package.json branch from resolve_conflicts. The earlier handler for that path remains.

Priority: Low

Estimated code review effort: 1 (Trivial) | ~3 minutes

Change: Refactor

Possibly related PRs

• che-incubator/che-code#763: Updates the rebase workflow with guidance for stale elif entries. This PR also changes the resolve_conflicts dispatch.

Suggested reviewers: rgrunber

Merge Risk: Minimal · up to 065d3

The conflict handler remains in place; this change appears ready to merge after normal checks.

Pre-merge checks: 5

Check name	Status	Explanation
Description Check		Check skipped - CodeRabbit’s high-level summary is enabled.
Title check		The title names the change: removing a duplicate mermaid elif entry from resolve_conflicts. The raw summary confirms that a duplicate mermaid-markdown-features/package.json conflict branch was removed…
Linked Issues check		Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check		Check skipped because no linked issues were found for this pull request.
Rebase Rules For Upstream Changes		PASS. The pull request changes only rebase.sh; it changes no files under code/. Therefore, .rebase/ rules and a .rebase/CHANGELOG.md entry are not required by this check.

Full details: Title check

Explanation

The title names the change: removing a duplicate mermaid elif entry from resolve_conflicts. The raw summary confirms that a duplicate mermaid-markdown-features/package.json conflict branch was removed from rebase.sh. The title is 65 characters, which meets the under-72 limit. It uses the "chore:" prefix, which the requirements do not forbid. However, it starts with "Remove" in the imperative mood, so it also meets the mood rule. The title uses the imperative mood, so the requirement is satisfied.

Finishing Touches

🧪 Generate unit tests (beta)

• Create a new PR

• Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

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.}

[github-actions]

Pull Request images published ✨

Editor amd64: quay.io/che-incubator-pull-requests/che-code:pr-844-amd64
Editor arm64: quay.io/che-incubator-pull-requests/che-code:pr-844-arm64
Dev image: quay.io/che-incubator-pull-requests/che-code-dev:pr-844-dev-amd64

[rgrunber]

Confirmed. Original is on line 524. That will always win.