On Mon, May 16, 2011 at 18:14, Rodrigo Rosenfeld Rosas <[email protected]>wrote:
> Hi, I've seen Marius did what he suggested: created the thin layer around > ultrasphinx. > > Now, comes the question. Should I rebase the rails-3.1 branch against > master? Or do you (Marius, Christian) prefer to do it yourself? > I'm not entirely sure how to handle this either, but I do know I want to keep the rails-3.1 branch up to date in case anyone else wants to chip in. As far as I know, the branch Marius pushed today is currently a spike, and it's not given that will merge it as is (Marius will have to confirm this). Maybe Marius has some input on the process going forward too. Personally, I think it makes sense to keep the rails-3.1 branch up to date with both your branch and master, to reduce the workload of eventually merging it all to master. So I don't think you'll go wrong with rebasing with master in any event. As you may have noticed, I also started a new branch today, unified-messaging-api. This branch introduces a new thin layer around the messaging API, and brings in place an implementation for the existing stuff as well as Resque and a new test adapter. I haven't commited all my changes yet because I still have a few tests to update, but keep an eye on it. We intend to merge this to master within the next week or two (I only have one more workday this week due to a trip and national holiday). Christian > > I'm asking that because I think there is no easy way that you can check > that I've only rebased instead of changing the commits... > > I'll not rebase for now, until you decide what to do regarding how we're > going to proceed with the rebase. Or if we're just going to merge stuff > instead of rebasing... > > At least, until now, there is no Rails 3 change yet in rails-3.1 branch. > > Best regards, > > Rodrigo. > > -- > To post to this group, send email to [email protected] > To unsubscribe from this group, send email to > [email protected] > -- MVH Christian -- To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected]
