Re: [Tiki-devel] Merge request: what happened?

Volker Wysk <post-hhF2Jplw28UoZk/[email protected]> Fri, 21 Jul 2023 20:15:02 +0200

Newsgroups	gmane.comp.cms.tiki.devel
Message-ID	<[email protected]>

Hi

Here's what git says:

--------
desktop /var/www/html/tikitest $ git status
On branch fix-sort-plugin
Your branch is up to date with 'origin/fix-sort-plugin'.

nothing to commit, working tree clean

desktop /var/www/html/tikitest $ git pull origin
remote: Enumerating objects: 1, done.
remote: Counting objects: 100% (1/1), done.
remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (1/1), 283 bytes | 283.00 KiB/s, done.
From https://gitlab.com/volkerwysk/tiki
   b615919e6a..ea3c0f928f  master     -> origin/master
Your configuration specifies to merge with the ref 'refs/heads/fix-sort-
plugin'
from the remote, but no such ref was fetched.
--------

Cheers,
Volker

_______________________________________________
TikiWiki-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel

signature.asc (application/pgp-signature, 833 B)