[Tiki-devel] Gitlab not merging all the files (git mysteries?)

Bsfez Tiki via TikiWiki-devel <[email protected]>
Newsgroups gmane.comp.cms.tiki.devel
Message-ID <[email protected]>
Hello devs,

Not so long ago I find out that a file was missing from a Tiki22 project I use.

I did a new merge between Tiki22 mirrored from the Tiki repo and my project Tiki22.
235 changes and file merge and it should have been good.



However when I look at this file it is in Tiki22 and not in my project.



(You can see I just merged 35mn ago)...



How this is possible ?
Is it possible merge do not create new file ???

Bernard

_______________________________________________
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.