Improve handling of "Merge failed: Conflicts detected during merge. Please try again."
Problem to solve
I get this message occasionally. "Merge failed: Conflicts detected during merge. Please try again." But it's never obvious what it means or what to do about it. Sure, it says "Please try again", which is actually the correct action, but so many websites say that line and don't really mean it. Can we make it clearer what is actually going on? As I understand it, this is a symptom of someone else pushing or merging while you're trying to merge. A) Can we just handle that better? Solve the problem automatically without having to push an error? If the conflicting merge isn't actually a problem, can't we just wait until the other merge happens and try again? If not, B) can we make the error message better?
Proposal
- Surface the more low-level errors triggering this error
- Update the UI to:
- show a clearer human-readable error
- display the lower-level error message surfaced by the backend
Edited by André Luís