Shopify / Shopify/shipit-engine
bug: stuck on finding merge conflicts
Nobody has claimed this yet.
- Dominant language
- Ruby
- Stars
- 1.5k
- Forks
- 154
- Avg merge
- 2h 26m
- Merged PRs (30d)
- 3
Description
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
Contributor guide
No contributing guide indexed for this repository
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
Research direction
No files, entry points, or tests are named. Start by reproducing a deploy that remains at “finding merge conflicts,” then inspect the status reporting path and the manual “Refresh statuses & commits” action. Done means a completed merge-conflict step is reported as complete without a manual refresh.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- ruby
- Domain
- devops, release
- Issue type
- Bug
- Difficulty
- 4/5
- Estimated time
- 3-5 days
- Activity status
- Stale
- Clarity
- Needs clarification
- Newbie friendliness
- 35/100