Stefan Sperling <s...@elego.de> writes: > Blindly marking all delete vs. delete conflicts resolved is wrong > (unless you don't care about rename conflicts).
As I said, it's debatable. One could decide that since renames don't exist they really are just copies and deletes. In that case the deletes don't conflict. -- Philip
