Re: Bogus Conflict During Commit

On Tue, Jul 7, 2009 at 11:44 PM, Chuck Holzwarth
<chuck_holzwarth_at_yahoo.com>wrote:

> We are running subversion 1.5.4 and tortoise 1.6.1 and a user has reported
> the following:
> I'm trying to commit a folder with changes. I get a conflict on a file
> (scc) that does not exist in the repo, nor in my local folder. Yet the
> commit fails because it says there is a conflict. I also tried a cleanup.
> still researching why this is happening.
>
> ------------------------------------------------------
>
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2368843
>
> To unsubscribe from this discussion, e-mail: [
> users-unsubscribe_at_tortoisesvn.tigris.org].
>

What is the exact error message you are receiving? Conflicts happen during
an update/merge, so normally one wouldn't expect them during a commit
(unless a file is still in conflict).

Cheers,
Daniel B.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-07-08 23:18:17 CEST