John W. Linville <linville@xxxxxxxxxxxxx> writes: > On Mon, Sep 08, 2008 at 03:24:58PM +0800, Zhu Yi wrote: > >> I find the wireless-testing GIT has been rebased twice in less than one >> month. Does it mean you give up making it a long lived merge-able tree? >> This may affect to the downstream wireless drivers code management. At >> least for iwlwifi, we'd expect to merge with wireless-testing everytime. > > There must be some mistake, it has not been rebased at all -- at > least not as far as git is concerned. I have done my now customary > "revert everything, pull from Linus re-apply" thing that I call a > virtual rebase, but the history has remained continuous. > > The non-master branches do get rebased of course. Perhaps you saw > that and thought that master had been rebased as well? FWIW, I also have had conflicts while pulling wireless-testing#master and I similarly thought that you have rebased it. But if you didn't I don't know what happened. -- Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
