Skills
.Work. You
Rest

diff-apply

Official

Safe diff application for ace_engine

Software Engineering#build#diff#patch#code-maintenance#merge-conflict#ace_engine#git-apply
Authoropenharmony
Version1.0.0
Installs0

System Documentation

What problem does it solve?

Applying generated diff files to the ace_engine codebase can be error-prone due to merge conflicts and potential logic changes. This Skill ensures diffs are applied safely with proper backups and validation.

Core Features & Use Cases

  • Diff/Application Workflow: Analyze, backup, apply, and resolve conflicts using standard tools (git apply, patch) and the project's conflict-resolution guidelines.
  • Conflict Resolution: Resolve diffs while preserving original behavior, guided by references/conflict_resolve.md.
  • Build Validation: Compile the project after applying diffs to ensure successful integration and detect regressions.
  • Use Case: When you need to apply a patch to ace_engine across TS/C++ sources with potential conflicts, and ensure compilation passes afterward.

Quick Start

  1. Place your patch file (diff or patch) in your working directory under ROOT/code/foundation/arkui/ace_engine.
  2. Execute the diff-apply workflow to apply the patch to the ace_engine tree.
  3. If .rej files appear, resolve conflicts using references/conflict_resolve.md and re-run the apply step.

Dependency Matrix

Required Modules

None required

Components

Standard package

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: diff-apply
Download link: https://github.com/openharmony/arkui_ace_engine/archive/main.zip#diff-apply

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 471,000+ vetted skills library on demand.