resolving conflicts

Hi Guys

I've been using svn for ages, we've had a developer who has now left

This morning I changed apage, svn commit, placed it on server in svn folder but it wont make the page live.

There must be a way of fixing such an issue from the local svn install is there not.?

And I cant find anything anywhere on the web about how to fix this issue

Charles Alder

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-05-21 01:43:52 CEST