Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Celebration

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,465,237
Community Members
 
Community Events
176
Community Groups

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

Edited

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.

2022-07-23_15-40_01_chrome.png

 

 

 

1 answer

0 votes
Patrik S Atlassian Team Aug 01, 2022

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

Like # people like this

Suggest an answer

Log in or Sign up to answer
DEPLOYMENT TYPE
CLOUD
TAGS

Atlassian Community Events