Anyone else getting the merge conflict when there should be none...and where inspecting the conflicts shows no difference between main and branch?
This is very disconcerting. We did several tests carefully controlling to ensure there were not changes to main, but inevitably we see conflicts. On the bright side, the fear of these conflicts keeps us merging branches in very short iterations, but it is a specter over our heads, and makes us feel less confident in the stability of the tool.
I saw one post on this and boosted it, but adding this to raise awareness.