I've observed: Styx and
Stones are both well known but merged
are quite a nightmare.
Kudos to Slinky, who summed up my current work excitement quite nicely. Styx and Stones being our code branches, and the nightmare being that I suddenly found myself with ownership of the merge process. Wheee!