starred/sky_phone-sky-systems
1
0
Fork 0
mirror of https://github.com/sky-systems/sky_phone.git synced 2026-08-29 00:01:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

BLD - add standalone phone development workflow

Browse Source
This commit is contained in:
smx.pusha
2026-08-06 08:23:14 +02:00
parent 5471040dd8
commit 0a880bc4d4
72 changed files with 6856 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.agents/skills/resolving-merge-conflicts/SKILL.md
+14
View File
@@ -0,0 +1,14 @@
---
name: resolving-merge-conflicts
description: "Use when you need to resolve an in-progress git merge/rebase conflict."
---
1. **See the current state** of the merge/rebase. Check git history, and the conflicting files.
2. **Find the primary sources** for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
3. **Resolve each hunk.** Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do **not** invent new behaviour. Always resolve; never `--abort`.
4. Discover the project's **automated checks** and run them — typically typecheck, then tests, then format. Fix anything the merge broke.
5. **Finish the merge/rebase.** Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
.agents/skills/resolving-merge-conflicts/agents/openai.yaml
+3
View File
@@ -0,0 +1,3 @@
interface:
display_name: "Resolving Merge Conflicts"
short_description: "Resolve merge and rebase conflicts"