[Kde-scm-interest] pushing rebased shared branches

[Ben Cooksley]

On Mon, Aug 8, 2011 at 10:39 PM, Marcel Wiesweg <marcel.wiesweg at gmx.de> wrote:
> Hi,

Hi Marcel,

>
> I have been fixing branches of SoK students, removing some dirty manual merges
> and branch mixups, by interactive rebase.
> I'm fully aware of the implications of rewriting history.
>
> I had the recollection we could now force-push branches, but:

In general, you are not supposed to perform force-pushes to shared
branches, so the server doesn't allow it. For those unfamiliar with
git, recovering from a force push isn't easy.

As a workaround, yes you can delete the branch then push it anew,
however you probably will run afoul of the 100 commit limit in any
case.
It is not recommended to workaround that, as it causes the mail server
problems, as some providers will block a server if it sends too much
mail too quickly.

>
> remote: + refs/heads/sok/presentation digikam mwiesweg DENIED by fallthru
> remote: error: hook declined to update refs/heads/sok/presentation
> To ssh://git@git.kde.org/digikam
>  ! [remote rejected] presentation -> sok/presentation (hook declined)
>
> Missing something here?
>
> I believe I can delete branches, so the alternative procedure would be to
> delete the branch and recreate it under the same name?

Regards,
Ben Cooksley
KDE Sysadmin

>
> Marcel
> _______________________________________________
> Kde-scm-interest mailing list
> Kde-scm-interest at kde.org
> https://mail.kde.org/mailman/listinfo/kde-scm-interest
>