Henry, I fairly certain that we'll have to manually resolve the pull requests. As far as I know, the Github mirror is simply a read-only mirror of the project's repository (be it svn or git). Hopefully someone will chime in and correct me if I'm wrong.
-- Joyce On Tue, Sep 3, 2013 at 6:18 PM, Henry Saputra <[email protected]>wrote: > So looks like we need to manually resolve the Github pull requests. > > Or, does github automatically know that a particular merge to ASF git repo > is associated to a GitHub pull request? > > - Henry > > > On Tue, Sep 3, 2013 at 1:38 PM, Matei Zaharia <[email protected] > >wrote: > > > Yup, the plan is as follows: > > > > - Make pull request against the mirror > > - Code review on GitHub as usual > > - Whoever merges it will simply merge it into the main Apache repo; when > > this propagates, the PR will be marked as merged > > > > I found at least one other Apache project that did this: > > http://wiki.apache.org/cordova/ContributorWorkflow. > > > > Matei > > > > On Sep 3, 2013, at 10:39 AM, Mark Hamstra <[email protected]> > wrote: > > > > > What is going to be the process for making pull requests? Can they be > > made > > > against the github mirror (https://github.com/apache/incubator-spark), > > or > > > must we use some other way? > > > > > > > > > On Tue, Sep 3, 2013 at 10:28 AM, Matei Zaharia < > [email protected] > > >wrote: > > > > > >> Hi guys, > > >> > > >>> So are you planning to release 0.8 from the master branch (which is > at > > >>> a106ed8... now) or from branch-0.8? > > >> > > >> Right now the branches are the same in terms of content (though I > might > > >> not have merged the latest changes into 0.8). If we add stuff into > > master > > >> that we won't want in 0.8 we'll break that. > > >> > > >>> My recommendation is that we start to use the Incubator release > > >> doc/guide: > > >>> > > >>> http://incubator.apache.org/guides/releasemanagement.html > > >> > > >> Cool, thanks for the pointer. I'll try to follow the steps there about > > >> signing. > > >> > > >>> Are we "locking" pull requests to github repo by tomorrow? > > >>> Meaning no more push to GitHub repo for Spark. > > >>> > > >>> From your email seems like there will be more potential pull requests > > for > > >>> github repo to be merged back to ASF Git repo. > > >> > > >> We'll probably use the GitHub repo for the last few changes in this > > >> release and then switch. The reason is that there's a bit of work to > do > > >> pull requests against the Apache one. > > >> > > >> Matei > > > > >
