Problem
Sometimes a deploy gets stuck on finding merge conflicts on shipit, even though if you click on the step, you can see that the step has actually passed, but its status has not been reported to shipit as complete!
A temporary solution is manually clicking Refresh statuses & commits:
I'm not sure if this is a global issue, but this happened on shopify-dev production
Problem
Sometimes a deploy gets stuck on
finding merge conflictsonshipit, even though if you click on the step, you can see that the step has actually passed, but its status has not been reported toshipitascomplete!A temporary solution is manually clicking
Refresh statuses & commits:I'm not sure if this is a global issue, but this happened on shopify-dev production