Done

When we finish a feature. Use when the user says work is done, asks to merge a worktree back to main/master, or clean up a worktree.

bholmesdev Updated 1.5k repo stars

File contents

Review remaining uncommitted code. If all changes are related and can fit into an atomic commit, create a single commit. If work should be broken into multiple atomic commits, do so and commit all.

If we're on a worktree, rebase onto main/master and resolve conflicts.

Then confirm whether to open a PR or merge into main directly.

If work on this feature was tied to a GitHub issue or taskboard ticket, mark that issue as completed if available tooling allows.

Finally, clean up the worktree.

bholmesdev/skills commit 26997b8887

Frequently asked questions

npx get-skill add bholmesdev/done-2