cgit-beta ports repository diverged?

[Rene Ladan]

See uqs' mail...

On Sat, Nov 28, 2020 at 11:38:54AM +0000, Rene Ladan wrote:
> Hello,
> 
> I just noticed that after doing a 'git pull' that the ports repository
> at cgit-beta seems to have diverged:
> 
>   rene at e17:/usr/freebsd/cgit-beta/ports % git status
>   On branch main
>   Your branch and 'origin/main' have diverged,
>   and have 546213 and 528036 different commits each, respectively.
>   (use "git pull" to merge the remote branch into yours)
> 
>   It took 5.85 seconds to compute the branch ahead/behind values.
>   You can use '--no-ahead-behind' to avoid this.
> 
>   nothing to commit, working tree clean
>   rene at e17:/usr/freebsd/cgit-beta/ports % git fetch
>   rene at e17:/usr/freebsd/cgit-beta/ports % git pull
>   fatal: refusing to merge unrelated histories
>   rene at e17:/usr/freebsd/cgit-beta/ports % 
> 
> and what happened to those 18000 commits?
> 
> René
> _______________________________________________
> freebsd-git at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/freebsd-git
> To unsubscribe, send any mail to "freebsd-git-unsubscribe at freebsd.org"