Date: Sat, 28 Nov 2020 11:46:36 +0000 From: Rene Ladan <rene@freebsd.org> To: git@freebsd.org Subject: Re: cgit-beta ports repository diverged? Message-ID: <20201128114636.GA24238@freefall.freebsd.org> In-Reply-To: <20201128113854.GA12390@freefall.freebsd.org> References: <20201128113854.GA12390@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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@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@e17:/usr/freebsd/cgit-beta/ports % git fetch > rene@e17:/usr/freebsd/cgit-beta/ports % git pull > fatal: refusing to merge unrelated histories > rene@e17:/usr/freebsd/cgit-beta/ports % > > and what happened to those 18000 commits? > > René > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20201128114636.GA24238>