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.
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
Hello, Patrick. We are using this status in a CI/CD process in our environment. Is there an alternative that we can use? Thanks
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Learn why Compass was built to tackle dev experience at scale. See how Atlassian uses it to boost visibility, reduce cognitive load, and drive consistency—plus tips to get started and customize your IDP for stronger team engagement.
Join the webinar ✨Online forums and learning are now in one easy-to-use experience.
By continuing, you accept the updated Community Terms of Use and acknowledge the Privacy Policy. Your public name, photo, and achievements may be publicly visible and available in search engines.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.