https://bugzilla.wikimedia.org/show_bug.cgi?id=53836
--- Comment #8 from Legoktm <[email protected]> --- (In reply to comment #7) > (In reply to comment #6) > > I don't think my issue is the same since the commit is missing from both the > > web viewers on git.wm.o and github. > > > > I'm not sure I've hardcoded an IP anywhere, I just use gerrit.wikimedia.org > > when cloning. > > So what happened here was the change was merged without a merge commit. Will > require some manual wrangling one way or the other to fix. Maybe I'm misunderstanding, but the commit was merged just fine. It didn't need a merge commit since at the time, it was directly on top of the current HEAD. It was replicated to github fine, and I pulled locally using my gerrit remote. When the upgrade happened it vanished. At that point, it was missing from gerrit.wm.o, but it was still visible on github, until the l10n-bot updated the translations, off of the HEAD on gerrit, which was (force?) pushed to github and overrode the "fix typo" commit. -- You are receiving this mail because: You are the assignee for the bug. You are on the CC list for the bug. _______________________________________________ Wikibugs-l mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
