Am 2/3/2011 13:42, schrieb Hugo Pereira Da Costa: > My understanding is also that people should refrain from cherry-picking > before > this original merge happens, cause that would only make it more painful.
Not necessarily. When you cherry-pick from one branch to another, and this works without conflicts, then a subsequent merge of the two branches is usually trouble-free as well (only as far as the changes that were cherry-picked are concerned, of course). Hannes -- "Atomic objects are neither active nor radioactive." -- Programming Languages -- C++, Final Committee Draft (Doc.N3092)