Re: Gitlab Migration

[Tassilo Horn]

theo@thornhill.no writes:

Hi Theo,

> Repo with double edits: 
> https://git.sr.ht/~theo/rebase/log
>
> Ok, so what happens?
>
> 1. Make some commits, push them
> 2. Rebase your stuff locally, get this warning after:

Well, looking at "git log --graph" of your repo, I'm pretty sure you
ended there because in step 2 you rebased commits which you had already
pushed and later merged the upstream branch with the locally rebased
one.  Rebasing commits which are already pushed is a no-go unless you
are working in your private branch.

Bye,
Tassilo