[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: resolving conflicts

From: Felix Saphir <felix.saphir_at_kantarmedia.de>
Date: Fri, 21 May 2010 02:27:57 +0200

charles schrieb:
>
> 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

Conflicts in a working copy can only be resolved in that directory where
the conflict is. You cannot resolve a conflict from your local working
copy or through the svn server.

Felix

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-05-21 02:28:07 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.