skills.rest
missingbulb
missingbulbCOMMUNITY
Explore all skills by this author →
GitHub

working-with-generated-files

Guides naming, editing, and merge-conflict resolution for tool-generated files.

Updated Jun 12, 2026
Search Tags:#git#workflow#code generation#merge conflicts#gitattributes#generated files#git rerere
One-click install
npx skills add https://github.com/missingbulb/GoogleCalendarEventCreator --skill working-with-generated-files-missingbulb
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: working-with-generated-files
Source: https://github.com/missingbulb/GoogleCalendarEventCreator/tree/main/.claudinite/shared/packs/basics/skills/working-with-generated-files
Command: npx skills add https://github.com/missingbulb/GoogleCalendarEventCreator --skill working-with-generated-files-missingbulb

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Generated files get hand-edited and then overwritten by the next generator run, and their merge conflicts get resolved by hand only to reappear. This Skill enforces the correct workflow: mark generated files, change the generator instead of the output, and resolve conflicts by regenerating. ## Core Features & Use Cases - Naming convention: Put GENERATED in the file name so its origin is obvious to every contributor. - Edit the generator, not the output: Directs all changes to the tool or test that produces the file rather than hand-editing the artifact. - Merge conflict resolution by regeneration: Clear conflict markers with either side, re-run the generator against the merged inputs, and commit that output. - Use Case: A snapshot test file conflicts across two branches. Instead of manually merging snapshots, pick either side, re-run the test generator, and commit the regenerated result. Optionally add a merge=ours .gitattributes entry and enable git rerere for recurring conflicts. ## Quick Start Ask the assistant to help resolve a merge conflict in a GENERATED file by regenerating it from the merged inputs instead of editing it by hand.

Frequently Asked Questions about working-with-generated-files

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

FAQPage Schema
How do I resolve merge conflicts in generated files?▼

Resolve merge conflicts in generated files by clearing the conflict markers with either side, re-running the generator against the merged inputs, and committing the regenerated output. Never hand-merge the generated content itself.

Should I edit a file generated by a test or tool?▼

No, do not hand-edit generated files because the next generator run will overwrite your changes. Instead, change the generator or its inputs so the output reflects what you need.

How do I mark a file as generated in a repository?▼

Put GENERATED in the file name so contributors immediately recognize it as tool output. This convention signals that edits belong in the generator, not the file itself.

Can git automatically resolve conflicts in generated files?▼

Yes, partially. A merge=ours entry in .gitattributes can auto-clear conflicts by keeping one side, and git rerere remembers resolutions for conflicts that recur. You still re-run the generator afterward to produce correct output.

Why do generated file conflicts keep coming back?▼

Recurring conflicts happen when branches diverge in the generator inputs and each regeneration produces different output. Enable git rerere to record and replay resolutions, and regenerate from merged inputs to settle the conflict permanently.

Related Skills

Explore More Software Engineering Skills→
missingbulbmissingbulb

working-with-generated-files

Guides naming, editing, and merge-conflict resolution for tool-generated files.

Community
Basic
OpenCovenOpenCoven
20

disk-space-optimizer

Remove regenerable artifacts from inactive repositories while preserving .git history.

Official
Intermediate
tarekBassiounytarekBassiouny

Najaah LMS - PR Review & Creation Workflow

Review code changes and create pull requests for the Najaah LMS project.

Community
Advanced
AGIBuildAGIBuild

local-tools

Manages .NET local tool manifests, installation, versioning, and CI/CD restore workflows.

Community
Intermediate