Please, someone tell me this app will be able to handle merging in a logical manner. The real problem I have with subversion in general is that when a confilct arises there is really no way of making sense of what is in conflict without digging through entire sections of code trying to make stuff merge which sucks.