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?