Branch without conflicts requires me to solve conflicts before merging

[David_Stenbeck]

I have a branch which I’d like to merge, it has no listed conflicts at all.

However I can’t merge it due to that I have to solve the conflicts that don’t exist before merging.