← Software Engineering ToolkitCONTENT HISTORY
WHAT CHANGED
Update to Software Engineering Toolkit
Snapshot Sep 30, 2026 · 23:17 UTC · version 0.1.0
Collection source: not recorded for this historical snapshot.
First saved snapshot
No earlier snapshot is available to establish a change.
Save Software Engineering Toolkit and check future changes in Following.
Up to 3 plugins free · no card required.
Compare saved observations
Download comparison JSONFull technical diff · 0 changed fields
Full snapshot data
{
"description": "Resolve merge or rebase conflicts by tracing intent and preserving both sides where appropriate.",
"included_files": [],
"name": "merge-conflicts",
"skill_md_contents": "---\nname: merge-conflicts\ndescription: Resolve merge or rebase conflicts by tracing intent and preserving both sides where appropriate.\n---\n\n# Merge Conflicts\n\nInspect each hunk, understand the intent of both changes from their primary sources, resolve by behavior rather than proximity, run focused tests, inspect the final diff, and complete the merge or rebase only when the result is coherent. Never discard a side blindly.\n"
}SHA-256 of public snapshot: 91d9a69564c55c62848df95992b855e95dbbbf6bb2ab078527f05632a3143794