Re: rolling back to a previous version

Rev. Steve Klett wrote:
> I then get the error below
> -------------------------------------------------------
> Error: Commit failed (details follow):
> Error: Aborting commit: 'C:\PMDRepository\IF_Firmware\trunk\UI.c'
> remains in conflict
>
>
> I'm not sure what I'm doing wrong, I have read the docs section about
> rolling back and followed them. User error or is something else happening?

You can't commit conflicted files. You have to solve the conflict first, then
you can commit the file. Use the "Edit Conflicts" menu item.

HTH, Rainer

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Sun Feb 5 00:21:29 2006