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

Hi Volker

Sorry you've had this sort of trouble, i've had similar issues in the past and got lost, so couldn't really help much - other than `git reset --hard HEAD` with usually get your local back in sync with the tiki repo.

When i do an MR i push to a new branch on my account then go to gitlab.com <http://gitlab.com/> (almost any page but https://gitlab.com/tikiwiki/tiki/-/merge_requests usually works) and a clever button appears saying you just pushed something, do you want to merge it.

HTH

jonny



> On 22 Jul 2023, at 08:54, Volker Wysk <post-hhF2Jplw28UoZk/[email protected]> wrote:
> 
> 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