Hello everyone,
When I try to merge a branch back into our MAIN branch I encounter the following error:
![](https://uploads-eu-west-1.insided.com/thinkwise-en/attachment/e7a61720-2317-474d-9d7a-ef58fd4ff22d.png)
Just before I did the actual merge, I did a merge from MAIN into the branch I am working on to apply some changed that had been done. This merge, apart from some branch related merge conflicts, went just fine. But when I try to merge back to MAIN, I get this error. And I had the exact same merge conflicts I had a bit earlier. The conflicts were resolved the same way: the development branch was the leading branch for these conflicts. But each time I get an error on a reference regrading column roles. We have a suspicion it might be a recently deleted column, but that column cannot be found in any recent branch.
What could be going wrong?