On Sat, Jul 22, 2023 at 09:08:37AM +0200, Miroslav Suchý wrote:
> Dne 21. 07. 23 v 10:50 Zbigniew Jędrzejewski-Szmek napsal(a):
> > > Is this expected? Or is this sign of something malicious happenening?
> > Dunno. Generally the most likely explanation would be that you have local
> > commits. But
Dne 21. 07. 23 v 10:50 Zbigniew Jędrzejewski-Szmek napsal(a):
Is this expected? Or is this sign of something malicious happenening?
Dunno. Generally the most likely explanation would be that you have local
commits. But if that is impossible, then something strange is going on.
Can you identify
Kevin Kofler via devel venit, vidit, dixit 2023-07-21 15:52:23:
> Miroslav Suchý wrote:
> > When I make SPDX statistics I have git checkout of all dist-gits and do
> > git-pull every two week there. This morning I found that two times I got
> > an error:
> >
> > hint: Diverging branches can't be
Miroslav Suchý wrote:
> When I make SPDX statistics I have git checkout of all dist-gits and do
> git-pull every two week there. This morning I found that two times I got
> an error:
>
> hint: Diverging branches can't be fast-forwarded, you need to either:
> hint:
> hint: git merge --no-ff
>
On Fri, Jul 21, 2023 at 10:28:04AM +0200, Miroslav Suchý wrote:
> When I make SPDX statistics I have git checkout of all dist-gits and do
> git-pull every two week there. This morning I found that two times I got an
> error:
>
> hint: Diverging branches can't be fast-forwarded, you need to
When I make SPDX statistics I have git checkout of all dist-gits and do git-pull every two week there. This morning I
found that two times I got an error:
hint: Diverging branches can't be fast-forwarded, you need to either:
hint:
hint: git merge --no-ff
hint:
hint: or:
hint:
hint: git rebase
