Re: [Tiki-devel] Merge request failed

Jonny Bradley via TikiWiki-devel <[email protected]>
Newsgroups gmane.comp.cms.tiki.devel
Message-ID <[email protected]>
Hi Volker

Nice, thanks for persisting with this!

I added a few comments on the MR, hope they make sense and you agree (you're welcome to ignore me too ;)

@Git experts: what does "Fast-forward merge without a merge commit" mean? And the [merge] button is red, is that significant?

Thanks again Volker, hope this is the first of many!

jonny




> On 30 Aug 2021, at 19:21, Volker Wysk <post-hhF2Jplw28UoZk/[email protected]> wrote:
> 
> Hi
> 
> I've played around and it seems to have worked now. The Gitlab page says:
> "Ask someone with write access to this repository to merge this request".
> 
> So, could someone with write access to this repository please merge this
> request? :)
> 
> Volker
> 
> 
> Am Sonntag, dem 29.08.2021 um 19:15 +0200 schrieb Volker Wysk:
>> Hi
>> 
>> I've done a merge request according to the "Git Workflow" page on
>> dev.tiki.org. It's shown here:
>> 
>> https://gitlab.com/tikiwiki/tiki/-/merge_requests/874
>> 
>> Something went wrong, and I don't understand the messages on the Gitlab
>> page. Could someone give me a hint of what's up?
>> 
>> Bye,
>> 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
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.