Separate the Checkouts, Then Integrate the Work

You want to refactor billing while fixing an unrelated UI problem. Separate Git worktrees give the two tasks different working directories and branches, so their file edits do not overwrite the same checkout.

They still share the repository's history, and they may share databases, ports, caches or external services. Changes can conflict when merged, including semantic conflicts that Git cannot detect.

Name each worktree and session, give each a bounded responsibility, and verify the location before editing. Review and test the combined result after integration. A clean merge is not proof that the two changes work together.

Worktrees themselves do not consume model tokens; every agent session you run in them does. Compare the total usage and coordination work with the time saved. Separate files make parallel work possible. They do not make coordination disappear.