Delete object from Branch line and merge back to mainline - conflict

Hi, I created a branch line from the mainline and during a fix in the branch line i deleted an object. How when i want to merge this back to mainline, i get a conflict and an option only to mark as resolved. DOing so will not delete the object in the mainline, leading to lot of errors. Any wrong procedure followed by me?  
1 answers

Hi Ganesh, You didn't followed wrong procedures. Each document (Domain model, Page, Microflow, etc.) in the Modeler is an element in the subversion control. Mendix will always try to merge documents from a branch-line to a main-line. I don't know what is changed in the main-line between the creation of the branch-line and the merge you try to execute now. But a movement in the domain model of a random entity is also considered a change of the domain model in Mendix. When you delete the object in the branch-line and change it in the main-line, subversion can't merge the changes and decide always to revert the deletion in the merge. Yes, this will give you errors in the rest of your model because the changes doesn't match anymore with your domain model.

I hope this give you some info on how Mendix works.