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

Volker Wysk <post-hhF2Jplw28UoZk/[email protected]> Sat, 22 Jul 2023 09:54:42 +0200

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

I've reinstalled from scratch. No more help needed now.

V.

Am Freitag, dem 21.07.2023 um 20:40 +0200 schrieb Volker Wysk:
> Hi again.
> 
> It looks like the Git-Workflow page is out of date. There were messages on
> my gitlab pages, saying that the user interface has changed. (Don't appear
> any longer.) 
> 
> In step 7, Git-Workflow says to "Create a new merge request from your forked
> repository on GitLab". But it looks like this must be done from the main
> tiki repository now.
> 
> How do I get my gitlab repository back to normal (with no merged request),
> so I can try again?
> 
> What git says now on my machine:
> 
> ------
> desktop /var/www/html/tikitest $ git status
> On branch master
> Your branch is behind 'origin/master' by 2 commits, and can be fast-
> forwarded.
>   (use "git pull" to update your local branch)
> 
> nothing to commit, working tree clean
> ------
> 
> Cheers,
> Volker
> _______________________________________________
> TikiWiki-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel

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

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