Hi Stepen, Thursday 15. September 2011 13.15.36 skrev ext Stephen Kelly : > [email protected] wrote: > > Looked again, still can't see a problem. > > > > Cheers, > > Lars > > Do you get this output? > > $ git rev-parse origin/refactor > e3ea41e21af96e6e41936421188139e3b933c859 > > Do you get this: > > $ git branch --contains origin/refactor > $ git branch --contains origin/refactor^ > * master > > Or this: > > $ git branch --contains origin/refactor > * master > $ git branch --contains origin/refactor^ > * master > > ? > > I get the first one. If you get the second one, it might be that it is > already merged into whatever clone you're using. > > I'm using git://gitorious.org/qt/qtbase.git
You are right, one patch was committed to refactor after the merge by accident. But then also cherry-picked into master. (5842e7e97efa80a9a8442e07f9898c32a4447102) So no worries, refactor is completely contained in master and only master should be used from now on. Cheers Frederik > > Thanks, > > Steve. > > > _______________________________________________ > Qt5-feedback mailing list > [email protected] > http://lists.qt.nokia.com/mailman/listinfo/qt5-feedback _______________________________________________ Qt5-feedback mailing list [email protected] http://lists.qt.nokia.com/mailman/listinfo/qt5-feedback
