Proper way to delete file from repository

I am wondering what is the recommended method to:
1. rename a file in a repository across trunk and development branches.
2. delete a file across trunk and development branches.

To delete a file on my current project where there is a trunk and 3 development branches it seems we always get tree conflicts when we merge into the trunk and I am wondering what the recommended method is.

Thanks.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3065180

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-24 19:45:23 CEST