"Blocked by a merge conflict": what it means and how long it takes
It is one of the most common lines in any stand-up:
The PR is blocked by a merge conflict on staging. I need to rebase.
If you manage a software team, you have heard it. Here is what it actually means, how worried you should be, and what to ask.
First, how developers share code
Developers rarely work on the live product directly. Each person makes their changes on their own copy of the code, called a branch. When the work is ready, they open a pull request (PR): a request to add their changes to the main version that everyone shares. Someone reviews it, and if it looks good, it is merged.
Think of it like several people editing copies of the same document, then combining their edits into the master copy.
So what is a merge conflict?
A merge conflict happens when two developers changed the same lines of code in different ways. The computer cannot guess which version is right, so it stops and asks a human to decide.
In the document analogy: you and a colleague both rewrote the same paragraph. Before the master copy can be updated, someone has to read both versions and produce one that keeps the best of each.
What do "rebase" and "staging" mean here?
- Rebase means updating your branch with the latest shared code, so your changes sit neatly on top of everyone else's. It is routine. It is often the step where conflicts show up.
- Staging is a test copy of the product that mirrors the live one. Code goes there for checks before customers see it.
So "blocked by a merge conflict on staging" means: my change clashes with someone else's change in the test version, and I need to combine them before testing can continue.
How long does it take?
Most merge conflicts are small and take minutes to a couple of hours. They become slower when:
- the two changes touch a large or central part of the product,
- the original authors are not available to explain their intent,
- the branch has been open for a long time and drifted far from the main code.
As a rule of thumb, plan for up to one working day if the conflict involves a core feature or two people's large changes.
Should you worry?
Usually, no. Merge conflicts are a normal part of teamwork, not a sign that anyone made a mistake. They become a warning sign only when they happen often, which can mean:
- branches stay open too long before merging,
- several people work on the same area without coordinating,
- the code is tightly tangled, which is often a symptom of technical debt.
The questions to ask
Instead of nodding along, ask one of these:
- "Who is resolving it, and by when?" It makes ownership and timing clear.
- "Does this affect anything planned for this week?" It links the issue to your plan.
- "Do you need anyone else to help untangle it?" It surfaces hidden dependencies.
The short version
| They say | It means | Typical impact |
|---|---|---|
| Merge conflict | Two changes clash and need combining | Minutes to one day |
| Rebase | Update a branch with the latest shared code | Routine, minutes |
| Staging | A test copy of the live product | Not a problem in itself |
Next time this line comes up in your stand-up, you will know exactly what is happening. And for everything else your team says, you can paste it into Plainlee and get the same kind of plain answer in seconds.