Oleh Krehel <ohwoeo...@gmail.com> writes: > Would it be so hard for Git to perform a single merge of master into > maint on release, while keeping them separate and cherry-picking > in-between for the sake of a clean linear history?
The question is not whether git is capable of doing this (there are ways to accomplish this goal). The true question is: Do you really want a linear history? A linear history may look pretty, but at the same time you loose information. In a big complex project that is also a dependency to another complex project, a bit more ugly bookeeping may make maintenance easier. -- Until the next mail..., Stefan.
