But if you have 6-10 machines you use and they're all a bit different, doesn't the branching get a bit tedious when you want to edit something that's common for all?

Vs. the chezmoi way of keeping everything common except using templates for diverging files.