Il 13/11/2013 16:01, Eduardo Habkost ha scritto: > On Wed, Nov 13, 2013 at 12:06:12PM -0200, Lucas Meneghel Rodrigues wrote: >> TL/DR; - We had pull requests incorrectly generated against next that >> were merged, in order to avoid messing up with things I merged master >> into next. No action is required by anyone copied on this message, >> this is just to make people aware of the mistakes. >> >> Hello folks: >> >> Yu just brought to my attention that we had some pull requests >> generated against master that were merged, breaking the expectations >> that patches go to next first, then to master, so they can stand some >> regression testing. >> >> The offending pull requests merged are: >> > [...] >> commit 19ed8562dee7e8fc7da9eda89560f6eb9edbd787 >> Merge: 3feece7 99759ff >> Author: Rudá Moura <[email protected]> >> Date: Fri Nov 8 10:19:11 2013 -0800 >> >> Merge pull request #1048 from ehabkost/cpuid-fixes >> >> CPUID config file updates >> >> >> I recently started using the nice little merge buttons on github, but >> the fact we easily miss the detail of which branch a pull request was >> generated against strikes me as a disadvantage. > > Sorry for that. I noticed it was submitted to master instead of next > only after Rudá had already merged it. > > By the way, I created the pull request when I opened > https://github.com/autotest/virt-test in a web browser and saw a pretty > box saying something like "you have this branch you just pushed to your > own fork" and a "Create Pull Request" button besides it. Github makes it > very easy to submit and merge code, but that also means it makes it very > easy to submit and merge code to the wrong places, sometimes.
I think whoever does the merge can choose what to merge into. So even if you generate a pull request from master, the maintainer can merge it into next. Paolo _______________________________________________ Virt-test-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/virt-test-devel
