skills.rest
getty104
getty104COMMUNITY
Explore all skills by this author →
Website𝕏@getty104GitHub

resolve-pencil-conflict

Resolve git conflicts in .pen files using Pencil CLI and git commands.

4|1|Updated Feb 14, 2026
Search Tags:#version control#design tool integration#git conflict resolution#Pencil design files#binary file handling
One-click install
npx skills add https://github.com/getty104/claude-task-worker --skill resolve-pencil-conflict
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: resolve-pencil-conflict
Source: https://github.com/getty104/claude-task-worker/tree/main/plugin/skills/resolve-pencil-conflict
Command: npx skills add https://github.com/getty104/claude-task-worker --skill resolve-pencil-conflict

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill requires @pencil.dev/cli, and includes scripts (resource) components.

What problem does it solve?

This Skill addresses the challenge of resolving git conflicts in .pen files created with Pencil, a design tool. It automates the process, avoiding the complexities of text merging and manual editing.

Core Features & Use Cases

  • Automated Conflict Resolution: Handles .pen file conflicts using a specific workflow that involves Pencil CLI and git commands.
  • No Text Merging: Ensures that text merging is not used, as .pen files are binary and cannot be merged textually.
  • Use Case: When a .pen file is in a conflicting state during a git merge or rebase, this Skill can be used to resolve the conflict efficiently.

Quick Start

Run the command: /claude-task-worker:resolve-pencil-conflict

Frequently Asked Questions about resolve-pencil-conflict

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I resolve git conflicts in Pencil design files?▼

Git conflicts in .pen files are resolved using Pencil CLI and git commands, automating the process to avoid manual text merging. This handles binary file conflicts efficiently during merges or rebases.

Why does text merging fail for .pen files in git?▼

Text merging fails for .pen files because they are binary design files that cannot be merged textually. Resolving these conflicts requires utilizing Pencil CLI and git commands to avoid manual editing.

What's the best way to handle binary file conflicts in version control for design tools?▼

Handling binary file conflicts in version control for design tools is best done using Pencil CLI with git commands. This workflow resolves .pen file conflicts without relying on standard text-based merging techniques.

Do I need the Pencil CLI installed to resolve .pen file conflicts?▼

Yes, you need the Pencil CLI installed and properly configured to resolve .pen file conflicts. This workflow requires the CLI to execute the commands that integrate with git for binary files.

Can I use standard git commands to fix conflicting .pen files during a rebase?▼

Standard git commands alone cannot textually merge conflicting .pen files during a rebase. You must use Pencil CLI alongside git to properly resolve the binary file conflicts in design workflows.

Related Skills

Explore More Software Engineering Skills→
Ameng2001Ameng2001
1

screenshot-to-pencil

Converts UI screenshots into editable .pen JSON prototypes with named color and typography variables.

Community
Intermediate
zts212653zts212653
2.6k

pencil-design

Convert .pen design files into React/Tailwind components.

Community
Intermediate
tametotameto

pencil-design

Manage Pencil design files as version-controlled JSON .pen assets.

Community
Advanced
adiytharpansaadiytharpansa

Git

Manage and repair Git repositories with commits, branches, merges, and rebases.

Community
Advanced