REST API documentation - Diff Stat status "merge conflict" is not documented

Question

In the REST API documentation for "Diff Stat" the value "merge conflict" is not mentioned. I've noticed this months ago, and it's still like this.

I'm pointing this out because an Atlassian employee has mentioned "merge conflict" value in this answer however it's undocumented, but it's actually being returned by the server.

Douglas Jardim_1xh0r2 · Answer

Hello, Patrick. We are using this status in a CI/CD process in our environment. Is there an alternative that we can use? Thanks

Patrik S · Answer

Hello @bgr_ ,

Thank you very much for reporting that, and you are right, the 'merge conflict' is currently one of the valid statuses returned by the server. However the 'merge conflict' will soon not be returned by this API endpoint as part of the recent change to  Improve performance on complex diffs

I've already reported the documentation update internally to the respective team.

Thank you, @bgr_ .

Kind regards,

Patrik S