merge conflict showing multiple files

Vasanthakumar_Sekar

A little background

I create a feature branch from the production branch, work on it, create a pull request to merge the contents to development, QA and finally to production. Between stages, a deploy branch gets created by Jenkins [tool used for automation] with the cherry-picked changes from the feature branch.

DEV and QA are merged without issues from the deploy branches by Jenkins. But the pull request to production branch is showing multiple merge conflicts in files.

---

So, I followed the steps given here 

 

Resolve merge conflicts | Bitbucket Cloud | Atlassian Support

 

After executing the step, 

"git pull origin Production"

step, I see

1. more than 500 files showing merge issues
2. 10k files show some changes. 

What am I doing wrong? How to resolve the conflicts only on the changes I am working on?

Syahrul

G'day, @Vasanthakumar_Sekar 

Welcome to the community!

I probably need to see the PR in question to further understand the issue but I suspect this is related to how Bitbucket cloud PR diffs work. So currently we use a 2-way ‘three-dot’ diff, which will show the difference between the tip of a source branch and the commit from which it branched off the destination. So the merge conflict you are seeing likely happens because of cherry pick or branch divergence.

For more information on this I highly suggest you check our blog announcement:

Improving performance on complex diffs 

Having said that, I notice you have a paid workspace. Could you raise a support ticket on our Support portal to investigate the issue further?

Thanks!
Syahrul