Update project merge conflict issue

Good day fellow Mendixer. I seem to have stumbled myself upon a pickle and was hoping you could aide me in my search for answers. My current user story is to remove obsolete attributes of an entity. My collegue's user story was to remove an obsolete entity and replace what was still needed with a new one. I made a change in a change action of a microflow, simply removing the changes to the attribute that I had removed. The microflow where the changes were made on had the parameter of the obsolete entity that my colleague was working on. Now I have a merge conflict, usually I would simple right click and select the option to use their whole document, however, this time the only option I have is to use my whole document. Why is this? I'd rather resolve the issue with whatever it is that my collegue did.
0 answers