The system is actually very good, having been fine tuned over a number of years. It just needs great care taken to only merge when you are absolutely sure, through very robust sourcing and double-checking every step you make, before completing the final merge. As you have found, if you make a mistake with merging it cannot be undone.