On Mon, May 16, 2011 at 11:38 PM, Christian Johansen <[email protected] > wrote:
> 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. > Well, I'm trying to keep the search stuff in master, not breaking anything. As for rebasing, wouldn't it be best if you rebase as you see fit? That's probably the best way to avoid diverging the two branches too much? Cheers, - Marius -- To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected]
