incubator-wave-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Yuri Z <vega...@gmail.com>
Subject Re: Please review the Pull Request - Full text search
Date Thu, 21 Aug 2014 22:47:00 GMT
Pull requests are just for code review. In the end the branch will be
merged manually. To prevent non fast forward merges we just need to rebase
the changes on top of master which will keep the history linear.


On Fri, Aug 22, 2014 at 1:41 AM, Ali Lown <ali@lown.me.uk> wrote:

> My concern with PRs, is that when it has lots of commits in, the
> resultant merge destroys the history.
>
> I tried to git-bisect the other day, and kept having to skip through
> non-compiling commits that were doing partial work, that had been
> pulled in from a PR.
>
> Perhaps, PRs but only if the work has been pre-squashed for submission?
>
> Ali
>
> On 21 August 2014 23:38, Yuri Z <vega113@gmail.com> wrote:
> > Unless there's an Apache policy against that, I think we should prefer
> > GitHub pull requests.
> >
> >
> > On Fri, Aug 22, 2014 at 1:34 AM, Ali Lown <ali@lown.me.uk> wrote:
> >
> >> Yuri,
> >>
> >> I shall take a look at this tomorrow morning.
> >>
> >> (We should probably decide whether we are going to use PR as the
> >> review procedure instead of Review Board?)
> >>
> >> Ali
> >>
> >> On 21 August 2014 23:31, Yuri Z <vega113@gmail.com> wrote:
> >> > Hi
> >> > I made some changes to the original full text search with Solr patch
> by
> >> > Frank Ren and created a pull request on GitHub -
> >> > https://github.com/apache/incubator-wave/pull/4
> >> > Please review.
> >> > Hopefully we will be able to do it fast so the full text search will
> be
> >> > included in the release.
> >>
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message