Hi, I'm currently reading COMMITTERS.md to learn the new commit process with the new "stable" and "master" branches and need some help:
First I picked a simple pull request https://github.com/puppetlabs/puppet/pull/1636 that I think should go in the stable branch (at leasts it's no backward incompatible feature ;-)). So I fetched Adrian's branch and since it was originally based on master, rebased it onto stable git rebase --onto stable master When I merge the rebased branch into stable everything works as expected. But when I merge the same branch in master I get * maint-readme_developer_explain_side_effects_in_tests: (maint) Add documentation on side effects in tests (packaging) Update PUPPETVERSION to 3.2.0-rc2 Note that the second commit is not part of the original pull request. stable seems to receive commits that are not present in master, so when I do the merge-up-procedure, I'd also merge other commits into master. Is this supposed to happen? -Stefan -- You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/puppet-dev?hl=en. For more options, visit https://groups.google.com/groups/opt_out.
