Re: [Tiki-devel] Merge request of code change on a single turned to a 49 commit
Bernard Sfez via TikiWiki-devel <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.devel |
|---|---|
| Message-ID | <[email protected]> |
It is on my fork, and I didn’t push it anywhere else to avoid messing with others work. On my fork the default is set to 25.x and it properly updated. Last commit is : [FIX] elFinder: Allow PDFs to be displayed from Finder view if `fgal_pdfjs_feature` is enabled Jonny Bradley authored 15 hours ago ;-) But I understand the solutions lies on my end. I’ll trash and recreate. (Nothing to be stressed about 5 strings translated) Thank you Jonny > On 23 Nov 2022, at 17:30, Jonny Bradley via TikiWiki-devel <[email protected]> wrote: > > Hi Bernard > > I don't see the MR on https://gitlab.com/tikiwiki/tiki/-/merge_requests so hard to tell, but it sounds like it needs rebasing (on https://gitlab.com/tikiwiki/tiki/-/tree/master) - maybe if you rebased it on a clone of tiki in your repo the mirroring has broken again? > > jb > > > >> On 23 Nov 2022, at 15:02, Bernard Sfez via TikiWiki-devel <[email protected]> wrote: >> >> Hello, >> >> I wanted to commit a handful of missing translation for hebrew. >> >> I create a new tiki from branch 25.x >> Create a new branch on my local >> Created a new branch >> Did a git pull —rebase before the changes >> Worked exclusively on lang/he/language.php >> Committed and push to my repo >> >> On Gilab when I click pin merge request it show a merge request for 49 commits (the oldest from 1 week ago). >> >> I didn’t merged of course. >> >> I remember it already happens to others, how to solve this ? >> >> Bernard >> >> >> _______________________________________________ >> 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 _______________________________________________ TikiWiki-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel