> Version control is designed for the exact problem of having multiple implementations exist and merging them as needed. This is a common misconception! The pr

> Version control is designed for the exact problem of having multiple implementations exist and merging them as needed. This is a common misconception! The primary purpose of version control is to answer discovery requests when the lawyers come knocking. :) (I'm only half joking here. I do think VCS merges are generally not a good idea, for technical reasons like criss-cross merges being an issue.)