You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
Next: Root
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
The Atlassian Community can help you and your team get more value out of Atlassian products and practices.
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.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.