Pushed https://hg.mozilla.org/webtools/tbpl/rev/4f68d73e1dce which will be visible on https://tbpl-dev.allizom.org/ in 10 minutes, but the only one that I know of with access to update tbpl.m.o is on PTO today.
Appears to be working based on what it does with already resolved merges, though I don't have an unresolved merge to actually test all of mcmerge.m.o with.
Just did a simple push to birch without issue. I'll try a full merge later.
In production :-)
Status: NEW → RESOLVED
Closed: 7 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.