Are your per-machine branches mostly distinct, or do they share a lot? I use https://github.com/thoughtbot/rcm https://github.com/thoughtbot/rcm and I find my

Are your per-machine branches mostly distinct, or do they share a lot? I use https://github.com/thoughtbot/rcm https://github.com/thoughtbot/rcm and I find my dotfiles share _quite a bit_ in some respects (e.g. neovim config) but are drastically different in others (SSH config as one example) -- keeping things synced _across_ branches sounds very difficult. rcm handles this well, without branches, IMO.