[05:15:10] 1qThe Wiktionary search bar seems to also include search results with any vowel diacritics for Arabic script, e.g. when I type کھسن and enter, it goes to [[کھَسُن]]. This doesn't seem to happen in other wikis, can I know how this is done? [05:17:04] sorry, that question was from someone on Discord, and it busted my IRC client so I had to post and quit... [05:17:50] I looked at settings.txt for CirrusSearch and found the $wgCirrusSearchUseIcuFolding setting; perhaps that's related? [06:07:44] Erutuon, yes, most likely [17:59:59] Hi all, I have difficulty cherry picking  a patch to a release branch, is anyone able to assist? [18:00:10] hey huji [18:01:00] The patch on master has been merged at https://gerrit.wikimedia.org/r/c/mediawiki/extensions/SecurePoll/+/755432 [18:01:34] yes? [18:01:48] I did: git checkout master; git pull; git checkout REL1_35; git pull; git cherry-pick 93758c [18:02:12] This lead to a merge conflict; I resolve it, then did git add and git cherry-pick --continue [18:02:22] At this point, I did git review, but got an error [18:02:29] "Remote rejected" [18:02:33] What am I missing? [18:02:54] can you paste the full git error message? [18:05:42] https://pastebin.com/H3gMLyQR [18:06:38] hmm, interesting - usually it tells you why it was rejected :/ [18:06:50] maybe it doesn't like that you're re= [18:07:02] re-using the same Change-Id on multiple branches or something [18:08:22] it is not the same change id tho [18:08:37] git log on REL1_35 branch shows me   a new ID for it [18:09:20] I thought it was supposed to be the same change ID [18:09:46] which branch was it trying to push to? [18:09:58] try `git push gerrit @:refs/for/REL1_35` maybe [18:10:07] oh wait it’s in line 7 of the paste, nevermind [18:10:36] oh wait [18:10:39] I think you need to either unabandon https://gerrit.wikimedia.org/r/c/mediawiki/extensions/SecurePoll/+/755407 or use a different Change-Id, since this Change-Id already exists on REL1_35 [18:10:51] the commit message still referenced old change id [18:10:52] (unabandoning would make sense IMHO) [18:11:05] removing it fixed it [18:11:29] https://gerrit.wikimedia.org/r/c/mediawiki/extensions/SecurePoll/+/755454 [18:11:32] success [18:11:39] thanks taavi [18:11:55] I'll update wikitechwiki