On Mon, Aug 13, 2012 at 08:59:52AM -0700, Andy Parker wrote: > On Sat, Aug 11, 2012 at 8:03 PM, Stefan Schulte > <[email protected]> wrote: > > 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. > > > > What we have been doing is immediately trying to figure out which branches > the change needs to be on and rebasing to that and then merging up. For > example, > a PR for a bug that is found in 2.7.18 is submitted against master. We > determine that > the fix is good for 2.7.x (because of low impact on other things) and > so apply the PR to > a topic branch of 2.7.x and merge it in, then we merge up through 3.x > and master. >
So the merges up 2.6.x -> 2.7.x -> 3.x -> master is still happening in the future? I'm just wondering if I merge a topicbranch into master and then rebase the topic branch to merge it into 2.7.x everything will be ok. But if you now merge 2.7.x into master you will end up with two identical commits (buts different SHA hash) in master right? -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.
