I get this regularly too, it's very annoying. I've started using one git worktree per Claude session specifically to avoid this issue.