Cleaning Up Branches

Keeping Your Branch List Tidy

After merging a feature, the branch is done — delete it to avoid clutter:

git branch -d feature      # delete (safe — refuses if unmerged)
git branch -D feature      # force delete (even if unmerged)

git branch                 # list local branches
git branch -a              # list local AND remote branches
git branch -r              # list remote-tracking branches only

Renaming a branch

git branch -m old-name new-name   # rename
git branch -m new-name            # rename current branch

Viewing merged/unmerged branches

git branch --merged          # safe to delete
git branch --no-merged       # still has unmerged work

Your Task

You have two branches: done (already merged) and wip (work in progress). Delete done safely with -d and rename wip to in-progress.