160332665e
Some checks failed
CI / test (push) Failing after 12s
将 settlement.py 的 settle_campaign_sessions 函数吸收为 ExplorationSessionRepository.expire_running_sessions 方法。删除浅模块 settlement.py（30 行，接口宽如实现），会话生命周期操作集中在 repository。 - 新增 ExplorationSessionRepository.expire_running_sessions(campaign_id) - 更新 campaigns.py 和 campaign_runner.py 两个调用点 - 删除 backend/agenteval/exploration/settlement.py - 所有测试通过，行为不变
15 lines
921 B
Markdown
15 lines
921 B
Markdown
---
|
|
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.
|