Great results, but > "While it makes the eventual git merge a nightmare when the branches diverge, a day of wrestling with merge conflicts is a small price to

Great results, but > "While it makes the eventual git merge a nightmare when the branches diverge, a day of wrestling with merge conflicts is a small price to pay for unfettered experimentation." terrifies me. It sounds like the sort of thing that makes a lot of sense until one day it doesn't and you're left with a massive bill of work to reconcile two very different codebases, all for the sake of UI experimentation.