'Bitbucket showing conflicts in file changes but not at top
I'm trying to merge a new branch I have created into develop. There were merge conflicts on the branch which I resolved locally and then pushed the changes to Bitbucket.
Now, you can see here that there are no conflicts flagged and I can happily merge this into our develop branch without any problems.
However, threaded throughout the changes I have things like:
Why are these old conflicts showing? I really don't want to merge and to have these appearing in every PR I raise... but it makes no sense to me that having clearly resolved these conflicts, they are still showing.
Sources
This article follows the attribution requirements of Stack Overflow and is licensed under CC BY-SA 3.0.
Source: Stack Overflow
| Solution | Source |
|---|