It's quite common for us (especially right now) to maintain parallel branches that are almost exactly the same. What are the best ways to do this? We can cherry-pick commits onto one after doing the other. Is there another way? We need to write this up and make it easier for maintainers (and more likely that the multiple branches will be maintained.)