> Markus - can you please merge in 0.25.x to master (to 0.25.4 tag) so > we can start to rebase the branches appropriately.
Short answer: not now. Long answer: I'm trying to work out a viable strategy for using the testing branch idea, and incorporate the already significant body of work (just Luke's and my branches at the moment) into this process in a way that makes sense. I'm rebuilding the testing branch ~100 times a day at this point and collecting various results of diferent ways of doing things. Dragging the 0.25.x stuff in wouldn't serve any immediate goal so far as I can see and would significantly complicate what I'm trying to do. -- Markus P.S. On a related subject: I'm close to advocating a total ban on merge commits as opposed to rebasing / cherry-picking. Merge commits in git are. IMHO, seriously broken (a significant fraction of the tools "ignore" them and many of the ones that don't simply act up when they encounter one). Can anyone give a cogent reason why they are a good thing, or show me the error of my ways? -- You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
