On Fri, Feb 04, 2011 at 08:47:08AM +0100, Johannes Sixt wrote: > (e) There is no (e). > as far as i'm concerned, there isn't even an (a). i said about a year ago and repeated it later that *if* we wanted a forward-merge based process, we would have to do the git migration *before* branching off the next stable branch. that ship has sailed - we are in our old cherry-picking process now, and merging will just make the history an utter mess (but then, i'm sure everybody loves seeing every commit twice - right?). and i'm strongly opposed to merging any previous branches back to master with -s ours, as this will effectively rewrite history (we did *not* merge back, and claiming that now will possibly hide actual omissions).
- Re: Merge or Cherry-Pick? Dawit A
- Re: Merge or Cherry-Pick? Aaron J. Seigo
- Re: Merge or Cherry-Pick? Tom Albers
- Re: Merge or Cherry-Pick? Michael Pyne
- Re: Merge or Cherry-Pick? Thiago Macieira
- Initial merge (was: Re: Merge or Cherry-Pick?) Johannes Sixt
- Re: Initial merge (was: Re: Merge or Cherry-Pick?) Thiago Macieira
- Re: Initial merge (was: Re: Merge or Cherry-Pick?) Andreas Pakulat
- Re: Initial merge Johannes Sixt
- Re: Initial merge David Faure
- Re: Initial merge (was: Re: Merge or Cherry-Pick?) Oswald Buddenhagen
- Re: Initial merge (was: Re: Merge or Cherry-Pick?) Thiago Macieira
- Re: Initial merge (was: Re: Merge or Cherry-Pick?) Nicolas Alvarez
- Re: Initial merge (was: Re: Merge or Cherry-Pick?) Thiago Macieira
- Re: Initial merge (was: Re: Merge or Cherry-Pick?) Nicolas Alvarez
- Re: Initial merge (was: Re: Merge or Cherry-Pick?) Thiago Macieira
- Re: Merge or Cherry-Pick? Nicolás Alvarez
- Re: Merge or Cherry-Pick? Ian Monroe
- Re: Merge or Cherry-Pick? John Layt
- Re: Merge or Cherry-Pick? Johannes Sixt
- Re: Merge or Cherry-Pick? Ben Cooksley