Please note you should not merge the same branch into master. Instead you should merge up all of stable like: git checkout master; git merge --no-ff stable On May 13, 2013 8:15 AM, "Jeff McCune" <[email protected]> wrote:
> It is possible that commits in stable that are not in the original pull > request are merged up into master. As long as you're using merge commits at > each step in the process you should be fine. > On May 12, 2013 10:42 AM, "Stefan Schulte" <[email protected]> > wrote: > >> On Thu, 9 May 2013 22:06:04 +0200 >> Stefan Schulte <[email protected]> wrote: >> >> > 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 >> > >> >> I'd really like to start reviewing pull request more often, but as I >> stated above, the current workflow is not clear to me. >> >> -- >> 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. >> >> >> -- 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.
