AGENT SKILL

resolving-merge-conflicts

Use when you need to resolve an in-progress git merge/rebase conflict.

License 许可
MIT
最近更新
2026-11-13
Stars
★ 21
Forks
4

01 前言 Front Matter

name
resolving-merge-conflicts
description
Use when you need to resolve an in-progress git merge/rebase conflict.

02 资源文件 1

03 SKILL.md 正文

  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.

04 同仓库更多 Skills

mambo-wang
mambo-wang/CodeWiki-Plus

write-doc-file-content-file-sidechannel

write_doc_file 建档报目标路径已被手写文件占用/路由冲突时——走 content_file 临时文件侧通道:正文写临时文件→删占位文件→write_doc_file(content_file=...) 正式建档→删临时文件

★ 21
mambo-wang
mambo-wang/CodeWiki-Plus

windows-python-release

当要手动发布 Python 包(codewiki-plus)到 PyPI 并建 GitHub Release 时——CI 不发布、Windows 控制台为 GBK、可能无 gh CLI、本机网络对 upload.pypi.org 的 Python TLS 握手有干扰——先核对 tag 区间与工作区未提交改动定 bump 级别,再按 8 步主干执行:同步四处版本→bump 提交(只 add 具体文件)→聚焦+ruff+全量闸门→清 dist 构建→PR 合并 main→tag merge commit 建 Release→uv publish(TLS 超时则 curl.exe 直传)→PyPI JSON API 核对

★ 21
mambo-wang
mambo-wang/CodeWiki-Plus

windows-dev-env

Windows/PowerShell 下做 git 写操作、跑子进程或批量文件/测试清理时:shell 漂移与中文路径致命令静默失败、无控制台宿主子进程闪窗、GCM 每次弹 OAuth 框、原生 DLL 被锁——须显式复核落盘、subprocess 加 CREATE_NO_WINDOW、gh auth setup-git 持久化凭据,并用 cmd /c 绕 safe-delete 钩子

★ 21
mambo-wang
mambo-wang/CodeWiki-Plus

repowiki-conclusion-update

已落库 repowiki 结论发生变化时,按「结论方向 vs 表述」分流:方向变则新写 decision 笔记+reject_note 旧+confirm 并回源 ADR,仅表述/证据变则 edit_doc_file 原地改

★ 21
mambo-wang
mambo-wang/CodeWiki-Plus

maintain-fork-pr-merge

当合入 fork 来源的 PR 且 mergeStateStatus=CONFLICTING/DIRTY 时——先 git merge-tree 探测冲突清单,查 maintainer_can_modify,再在 worktree 隔离目录解冲突后 push fork 分支,勿因 CI 绿直接 merge

★ 21
mambo-wang
mambo-wang/CodeWiki-Plus

git-commit-hygiene

在共享 worktree 多会话并行或暂存区有残留时提交代码——用显式 pathspec 只提交自己的文件并排除临时目录,禁止 git add -A 或裸 commit 扫入并行会话的改动

★ 21