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

REST API: possible bug - PR diffstat doesn't contain information about merge conflict

I'm using the PR diffstat endpoint to check if any of the PRs have merge conflicts. I've noticed that for one PR that has a conflict when opened via web browser, there is no "merge conflict" status returned on that file when using the API. I've also tried adding `?topic=false` and `?topic=true` but it made no difference.

Additionally, when opening the PR from the browser, sometimes it takes a long time for the conflict information to show up (for the first 5-40 seconds the PR appears as if there is no conflict, then the conflict info box shows up). Is there some additional API that returns information about conflicts? Is this related to this change?

Related questions: [1] [2]

0 answers

Suggest an answer

Log in or Sign up to answer
DEPLOYMENT TYPE
CLOUD
PERMISSIONS LEVEL
Site Admin
TAGS
AUG Leaders

Atlassian Community Events