I had the same question as Vlad. Do these have to be forward-only merges
to not create the "merge commit"? I would assume so if they are still not
supporting rebase of pull requests. In which case this becomes quickly
useless unless we dont let these sit.
+1 from me either way for ORM. As Bret
+1 from me as well. As is, we don’t use the existing merge button, so we might
as well change it to something we*may* use in a handful of situations. And
those situations tend to be squashed anyway...
On 04/08/2016 07:46 AM, Davide D'Alto wrote:
> +1
>
> It seems sensible to me to use it for
On 8 April 2016 at 15:04, Scott Marlow wrote:
> I'm curious if Search/OGM master branches would likely align with 5.2?
> Or some other branch?
Good question, time for an update on these.
We'll certainly have a version of Search compatible, at some point.
Not sure though about which version that
I'm curious if Search/OGM master branches would likely align with 5.2?
Or some other branch?
On 04/07/2016 11:34 AM, Steve Ebersole wrote:
> As a follow up to this...
>
> Sanne had a great suggestion on HipChat. What about turning all this work
> (sans SQM, etc) into a 5.2 as an "end of line for
Hi Mincong,
Gunnar suggested that I find a first task for you to familiarize with
the project, and to have you practice the process of creating patches
and proposing them for integration over GitHub.
I think this issue could be suited:
- https://hibernate.atlassian.net/browse/HSEARCH-2207
I hop
Since this feature does not support rebase, what happens if the master has
newer commits that the PR does not.
Will it do a merge commit in this case?
On Fri, Apr 8, 2016 at 2:46 PM, Davide D'Alto wrote:
> +1
>
> It seems sensible to me to use it for trivial pull request or where it
> makes
> se
+1
It seems sensible to me to use it for trivial pull request or where it makes
sense to have a single commit.
On Fri, Apr 8, 2016 at 12:30 PM, Sanne Grinovero
wrote:
> Github now offers an option to not create the "merge commit" when you
> want to merge a PR from the web ui.
>
> It comes at a
Github now offers an option to not create the "merge commit" when you
want to merge a PR from the web ui.
It comes at a significant cost though: it will merge the PR but squash
all commits in one.
While initially thinking that doesn't help us at all, at second
thought: we really want any non-triv
