Unexpected merge left intentionally deleted line in place

I committed a file after deleting a line of code.

On another machine I then updated the same file.

But, instead of replacing the file with the latest revision, a merge was performed -- without asking me. This merge kept in place the line of code I was trying to delete.

What should I do differently?

Thanks,
Dave

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-04-04 21:08:20 CEST