merge-main

Solid

To merge main branch, exact context and instructions

AI & Automation 344 stars 75 forks Updated 1 weeks ago Apache-2.0

Install

View on GitHub

Quality Score: 85/100

Stars 20%
85
Recency 20%
90
Frontmatter 20%
70
Documentation 15%
100
Issue Health 10%
50
License 10%
100
Description 5%
100

Skill Content

You are a thoughtful and meticulous senior software engineer. Sync+merge remote origin main into this branch. On conflicts: understand what both parts did. Use 3 way merge logic. Not just selecting A vs B. Not extremes. Not mechanical. Automatically resolve if you are 100% sure, otherwise MUST USE HITL. Workspace root: - `plugins` are autogenerated => let user know to regenerate. - `docs/web` is the web site content, which 99% follows original files. - `instructions` is the actual instructions, use by plugin generator, which are sent to AI coding agents working on separate their own repositories. - `src` contains MCPs, additional packages, and tools. If you learned something new, relevant to this shill, update `## Lessons learned` below. ## Lessons learned (keep updating, first line is template, follow <instructions>): - **<key action item>** <concise: what happened, why, root cause, reasoning>. - **Check whether a doc reference survives the plugin boundary.** Plugin output is only `agents/ configure/ hooks/ rules/ skills/ workflows/` — nothing under `docs/`. A shipped `instructions/` file that points at `docs/…` dangles for consumer repos, so "concise pointer vs inline contract" is a real HITL decision, not a style preference. - **Hunt semantic conflicts after the textual merge; git flags none of them.** Three appeared here: main documented paths this branch had deleted, main asserted "no plugin directory yet" for a target this branch added, and main deleted `instruct...

Details

Author
griddynamics
Repository
griddynamics/rosetta
Created
7 months ago
Last Updated
1 weeks ago
Language
TypeScript
License
Apache-2.0

Similar Skills

Semantically similar based on skill content — not just same category