can we squash unreleased history?

[Nicolas Peltier <np...@apache.org>]

Hey

am about to start a release process for jcr resource bundle, but in the
resolution of a ticket i messed up in the history basically not squashing
review commits [0], which kind of pollute it.
Is it possible at all to squash the 3 commits related to SLING-8761 and
push --force them?
If there is any chance to mess things up a bit more, i'll just go ahead
with the release.

wdyt?
Nicolas


[0]
https://github.com/apache/sling-org-apache-sling-jcr-resource/commits/master

Re: can we squash unreleased history?

[Nicolas Peltier <pe...@gmail.com>]

ok, thanks guys!

Le lun. 2 déc. 2019 à 12:00, Bertrand Delacretaz <bd...@apache.org> a
écrit :

> Hi Nicolas,
>
> On Mon, Dec 2, 2019 at 11:49 AM Nicolas Peltier <np...@apache.org>
> wrote:
> > ...Is it possible at all to squash the 3 commits related to SLING-8761
> and
> > push --force them?...
>
> Possible maybe (I don't know if the repository settings allow that)
> but desirable no, IMO.
>
> I think we should use force push only in extreme cases, as the
> potential for messing things up is real.
>
> Keeping a pretty history can be nice (by cleaning up before pushing to
> a public place) but if we forget I think that's no big deal.
>
> -Bertrand
>

Re: can we squash unreleased history?

[Bertrand Delacretaz <bd...@apache.org>]

Hi Nicolas,

On Mon, Dec 2, 2019 at 11:49 AM Nicolas Peltier <np...@apache.org> wrote:
> ...Is it possible at all to squash the 3 commits related to SLING-8761 and
> push --force them?...

Possible maybe (I don't know if the repository settings allow that)
but desirable no, IMO.

I think we should use force push only in extreme cases, as the
potential for messing things up is real.

Keeping a pretty history can be nice (by cleaning up before pushing to
a public place) but if we forget I think that's no big deal.

-Bertrand

Re: can we squash unreleased history?

[Radu Cotescu <ra...@apache.org>]

Hello Nicolas,

> On 2 Dec 2019, at 11:49, Nicolas Peltier <np...@apache.org> wrote:
> 
> Is it possible at all to squash the 3 commits related to SLING-8761 and
> push --force them?
> If there is any chance to mess things up a bit more, i'll just go ahead
> with the release.
> 

It’s too late to rewrite the history for those commits since they’re already in master. You don’t know who has already pulled in your changes.

Cheers,
Radu