On Wed, Aug 01, 2012 at 03:46:09PM -0700, Andy Parker wrote: > Ok, so based on what has been talked about here and my frustration > I've put together another change for > the CONTRIBUTING.md. > > https://github.com/puppetlabs/puppet/pull/995 > > I took out a lot of the verbiage and cut it down to what I think is > the essence. A lot of the things that it used to > say I'm going to move to the wiki, but that hasn't been done yet. My > question is, does this new one look like it > is clear and concise? Does this look like a policy that would help > people feel like they can get in and contribute > with confidence that they are doing it in a way that is helpful? >
How does the situation now looks for someone who wants to merge code? Let's say there is a request to pull ticket/master/foo into master. If I get it right I would first merge the code into the master branch and if I don't do anything afterwards the new code will be present in the next major release (so when 3.1.x is created I guess) and not earlier. 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? -Stefan -- 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.
