Re: [Freemint-discuss] Bintray integration / git force-push needed

[Miro K. <mir...@gm...>]

On 24 February 2018 at 11:27, Thorsten Otto <ad...@th...> wrote:


> >git history has to be totally rewritten, so if you have a branch/fork of
> your
> >own, you have to do a hard reset + rebase/cherry-pick
>
> I wouldn't do that if it can be avoided.

I wouldn't if it could be avoid as well. :) The biggest pain is that now
the repo contains EmuTOS, TeraDesk, fVDI etc. So it prolongs git clone for
everybody and serves no purpose.

All these forks will be affected by this, too, and of course every repo
> that someone has cloned locally. That will be at least as much work that
> you did, for everybody who is affected, maybe even worse
>
Actually, it's not that bad. One just has to fetch from the upstream
origin, reset his local master (or any other branch) to upstream and force
push to his own github repository. That will make the fork in sync again.
The only issue is dev branches, i.e. one has to manually go branch by
branch and rebase/cherry-pick on the top of the new commit ID.

I'm of course prepared to offer advice/assistance -- trust me, I'm no git
expert at all and I could manage quite easily. One just has to be careful
to push to the right remote. ;-)


> >otherwise I'll do the git force-push sometime on Sunday.
>
> I would wait a few days more. SF still seems to have problems with their
> mailing lists, maybe the complaints just don't make it to the list.
>
Fair enough, there's no rush.

-- 
MiKRO / Mystic Bytes
http://mikro.atari.org