Is the branch going to be released -> trunk==yes, dev-branch==no
 Breaks should be avoided in released branches but encouraged in
dev-branches. It sounds odd to encourage broken code, but the more
adventurous and the less shy, the less likely developers spin their
wheels while their subconscious calculates risk vs reward and get stuck
second-guessing the ability to hit a home run with every contact with
the code.

Small changes is a good plan, nice and smooth. Easier to see the
progression and once merged all those get collapsed into a nice subtree.