I would say it's largely up to you. I absolutely don't follow the one commit per branch rule. I add as many commits as I think are necessary for the branch and then go from there.
I just stack based on meaningful pieces of work. E.g. if I have a CRUD feature to build I might do the create section in one branch, update in another and so on.