flow-finishing-branchlisted

# Flow Finishing Branch - 分支完成决策 ## Overview When development work is complete, you need to decide how to integrate it. This skill guides that decision. ## Decision Options ### A) Fast-forward Merge ```yaml When to use: - Small changes (< 5 files) - Single developer - No review needed - Clean commit history Command: git checkout main git merge --ff-only feature/xxx git branch -d feature/xxx Pros: - Fast - Clean history - No merge commit Cons: - No review record - No CI verification ``` ### B) Create PR (Recommended) ```yaml When to use: - Team projects - Need review record - CI verification required - Production code Command: git push -u origin feature/xxx gh pr create --title "..." --body "..." Pros: - Review record - CI verification - Discussion thread - Audit trail Cons: - Takes longer - Requires reviewer ``` ### C) Squash and Merge ```yaml When to use: - Many small commits - Messy commit history - Want single commit in main Command: gh pr merge --squash Pros: - Clean main history - Single logical commit - Hides WIP commits Cons: - Loses detailed history - Harder to bisect ``` ### D) Cleanup Only ```yaml When to use: - Work was abandoned - Experiment failed - Requirements changed Command: git checkout main git branch -D feature/xxx git push origin --delete feature/xxx # if pushed Pros: - Clean slate - No dead branches Cons: - Work is lost (unless needed later) ``` #