API returning conflict markers in PR diff without actual conflicts

[Junior Sartori]

Hello Bitbucket community,

I'm experiencing an issue where the Bitbucket Cloud API returns conflict markers in Pull Request diffs that have no actual conflicts.

Endpoint used:

GET /2.0/repositories/{workspace}/{repo_slug}/commits/{spec}/diff

Parameters:

• spec: {commit_hash_1}..{commit_hash_2} (two-dot format)
• path: specific file path

What's happening:

The API returns content with Git conflict markers like:

<<<<<<< destination:a1b2c3d4e5f6g7h8i9j0k1l2m3n4o5p6q7r8s9t0
const API_TIMEOUT = 5000;
const MAX_RETRIES = 3;
=======
const API_TIMEOUT = 3000;
const MAX_RETRIES = 5;
>>>>>>> source:9z8y7x6w5v4u3t2s1r0q9p8o7n6m5l4k3j2i1h0

Important context:

• The PR has no actual conflicts (Bitbucket UI confirms this)
• The file was committed without conflicts
• The commit hashes in the markers are valid and belong to the PR

Questions:

1. Is this a known API bug?
2. Is there a specific condition that causes this?
3. Is there a workaround or alternative parameter we should use?

Thank you for your attention!