Manually apply a Git commit diff to the current branch.
npx skills add https://github.com/penpot/penpot --skill backport-commit
Please help me install this Agent Skill. Skill: backport-commit Source: https://github.com/penpot/penpot/tree/main/.opencode/skills/backport-commit Command: npx skills add https://github.com/penpot/penpot --skill backport-commit
Backport changes from a specific Git commit to the current branch by manually applying the diff, avoiding git cherry-pick when it would introduce complex conflicts.
Identify the target commit and begin the manual backport workflow to apply changes to the current branch.
High-intent search queries and answers about installing and using this skill.
To backport a commit without cherry-pick, manually apply the diff to your current branch. This approach inspects the target commit's diff, identifies affected modules, and patches files hunk-by-hunk to avoid complex merge conflicts.
Git cherry-pick introduces merge conflicts when a commit touches multiple modules with diverging histories. Manual diff application resolves this by patching changes hunk-by-hunk and reviewing module-specific constraints before editing.
The best way to apply a patch safely is to manually apply the diff hunk-by-hunk to the current branch. This module-aware method ensures you preserve intent and validate the result with project checks before committing.
To resolve conflicts when backporting changes, manually apply the diff to each affected file. You inspect module-specific constraints and carefully patch the changes hunk-by-hunk instead of relying on automated cherry-pick.
You should avoid git cherry-pick when a commit touches multiple modules or introduces complex conflicts. In these scenarios, manually applying the diff provides careful patching and module-aware review to safely backport changes.
maxmurrGenerate commit messages from git diff --staged with WHAT/WHY summaries.
StudyDriftAssess branch changes for quality and test coverage, then prepare a pull request.
janpeterdNavigate Hunk terminal diff sessions and place inline review comments.
dalawwaMerge changes from git worktrees into the current branch.
