> Of course, --ignore-ancestry will also, well ignore ancestry, > and only do a diff. So, if you have a file with the same name > as an earlier file with the same path/name that is not > actually its parent you are going to get a bad merge.
Sorry, I'm a bit lost here. Could you explain this maybe with an example? Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
