chore: Address coderabbitai's comments

Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
Generated-by: Cursor AI

Author: RomanNikitenko

.claude/skills/add-rebase-rules/SKILL.md

@@ -67,7 +67,10 @@ Important:
      - add `elif` branch calling `apply_package_changes_by_path "$conflictingFile"` (or equivalent existing pattern).
    - For non-JSON replace rules:
      - use `apply_changes "$conflictingFile"` for line-based replacements.
-     - use `apply_changes_multi_line "$conflictingFile"` when multiline replacement is required.
+     - For multiline replacements, `rebase.sh` has **two** handlers — do not always default to one:
+       - `apply_changes_multi_line "$conflictingFile"` — higher-level wrapper that resets the file (`git checkout --theirs`), calls `apply_multi_line_replace`, then stages the result (`git add`).
+       - `apply_multi_line_replace "$conflictingFile"` — low-level function that performs the Perl multiline replacement directly, without git checkout/add.
+     - Before adding a routing branch, inspect the existing `resolve_conflicts` block in `rebase.sh` and look at how other files in the same area are routed. Match the handler already used for similar files. For example, if neighboring entries call `apply_multi_line_replace` directly, use that; if they use `apply_changes_multi_line`, use that instead.
    - Do not add duplicate branches.
 
 6. Update `.rebase/CHANGELOG.md`

CLAUDE.md

@@ -85,7 +85,7 @@ Replace `che-api` with any Che extension name. Generates dependency reports in `
 - **`.rebase/`** — Patch management for upstream rebasing:
   - `add/` — Files to add to upstream
   - `override/` — JSON files to merge over upstream (via jq)
-  - `replace/` — Files to wholesale replace in upstream
+  - `replace/` — Per-file JSON replacement rules keyed by file path (not full file swaps). Each entry is a JSON object with `from` and `by` strings applied to the specified file path.
 
 ### Che-Specific Extensions (in `code/extensions/`)
 
@@ -111,7 +111,7 @@ Nine extensions provide Kubernetes/Che integration:
 
 To rebase on upstream VS Code:
 1. `git remote add upstream-code https://github.com/microsoft/vscode` (if not already added)
-2. `git fetch upstream-code main`
+2. `git fetch upstream-code release/<version>` — fetch the release branch that `rebase.sh` targets (check `UPSTREAM_VERSION` in `rebase.sh` for the current ref, e.g. `upstream-code/release/1.104`)
 3. `./rebase.sh` — Pulls subtree, applies `.rebase/` patches, updates JSON overrides
 4. Fix any conflicts
 5. `./build/artifacts/generate.sh` to update `artifacts.lock.yaml`