merged development branch with a bunch of commits

[Zoltan Haindrich <ki...@rxd.hu>]

Hey All!

Seems like a changeset was merged without being squashed first...now we have a changeset in 38 commits...
I wanted to fix this - but I was not able to force-push the master branch to properly merge https://github.com/apache/hive/pull/2037

https://github.com/apache/hive/commits/master?before=2eb0e00d5d614d3144519cf4861ec1759a373c7d+35&branch=master

What do we want to do with this?

cheers,
Zoltan

Re: merged development branch with a bunch of commits

[Stamatis Zampetakis <za...@gmail.com>]

Good catch Zoltan!

I think it makes sense to enable force pushing for this and other similar
kinds of problems. I don't find the errata approach [1] very convenient to
fix these kinds of issues.

As I said previously in [1] I don't see a big risk in enabling force push;
it isn't something to be used regularly but it is very helpful to clean up
messy situations.

Best,
Stamatis

[1]
https://lists.apache.org/thread.html/ra1c0b002e4b862b97ed2bbfd6d48f128df7305f349daeb62770351be%40%3Cdev.hive.apache.org%3E

On Tue, Apr 6, 2021 at 6:41 PM Zoltan Haindrich <ki...@rxd.hu> wrote:

> Hey All!
>
> Seems like a changeset was merged without being squashed first...now we
> have a changeset in 38 commits...
> I wanted to fix this - but I was not able to force-push the master branch
> to properly merge https://github.com/apache/hive/pull/2037
>
>
> https://github.com/apache/hive/commits/master?before=2eb0e00d5d614d3144519cf4861ec1759a373c7d+35&branch=master
>
> What do we want to do with this?
>
> cheers,
> Zoltan
>