lucene-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Yonik Seeley <>
Subject Re: Merge vs Rebase
Date Mon, 25 Jan 2016 20:53:35 GMT
On Mon, Jan 25, 2016 at 2:47 PM, Shai Erera <> wrote:
> The 'merged' commit, in this case, seems redundant to me as it doesn't add
> any useful information about them. I believe this case isn't an example one
> for a merge. Just my thoughts...


For back-porting the majority of issues from trunk to 5x, cherry-pick
should definitely be the default we point to.
"merge" is about merging *all* changes from a branch, so it won't even
work unless one has a separate feature branch for the change being


To unsubscribe, e-mail:
For additional commands, e-mail:

View raw message