HI there, when trying to rebase locally in a commit/push phase I ended up having this error and not being able to open anymore the .aird project in Capella. Anyone support to resolve the conflict?
