On Sat, Aug 11, 2012 at 9:03 PM, Stefan Schulte <[email protected]> wrote: > If the change needs to be backported to older branches how does this > work? If I checkout 2.7.x and cherry-pick commits from the master > branch the history of 2.7.x does not say which commit belongs to which > old feature branch right (no merge commits)? Or would I copy the branch > ticket/master/foo as ticket/2.7.x/foo and use git rebase with --onto > 2.7.x and then merge ticket/2.7.x/foo into 2.7.x?
Speaking for myself, your second option sounds good to me. It seems like would best fit with what Puppet's already doing (tracking code reviews using explicit merge commits.) - Ken -- 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.
