External/5chan
1
0
Fork 0
mirror of https://github.com/bitsocialnet/5chan.git synced 2026-08-03 07:41:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(ai skills): correct stale branch names, rg flags, and commit scope rules

Browse Source 
Fixes deslop diffing against nonexistent main, an invalid rg --type tsx flag
in fix-merge-conflicts, a Codex-specific phrase leaking into the Claude/Cursor
inspect-elements description, and aligns commit-format with the required-scope
convention the commit skill and git history already use. Rewrites the readme
skill from 764 lines of Rails-specific guidance to a lean version matching
this Vite/Capacitor/Electron repo.
This commit is contained in:
Tommaso Casaburi
2026-07-03 13:58:34 +07:00
parent 57310867ec
commit 21bbc5f07c
24 changed files with 189 additions and 2262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.cursor/skills/fix-merge-conflicts/SKILL.md
+3 -3
View File
@@ -56,7 +56,7 @@ If `package.json` was modified, run `corepack yarn install` first.
### 4. Verify no remaining markers
```bash
rg '<<<<<<<|=======|>>>>>>>' --type ts --type tsx --type json
rg '<<<<<<<|=======|>>>>>>>' --type ts --type json
```
If any markers remain, go back and resolve them.
@@ -65,7 +65,7 @@ If any markers remain, go back and resolve them.
```bash
git add -A
git commit -m "chore: resolve merge conflicts"
git commit -m "chore(merge): resolve merge conflicts"
```
## Operational Guidance
@@ -79,5 +79,5 @@ git commit -m "chore: resolve merge conflicts"
- Clean working tree with all conflicts resolved
- Passing `corepack yarn build && corepack yarn lint && corepack yarn type-check`
- One local commit: `chore: resolve merge conflicts`
- One local commit: `chore(merge): resolve merge conflicts`
- Brief summary of files touched and notable resolution choices