>I resolved the conflicts the while merging the branch in main trunki but was unable 
>to commit.
>
>Was getting  error of sticky tag. So I run the update -A command. Now  I lost all the 
>conflicts I resolved during the conflict
>
>Is there any way I can undo this update operation as I didn't take the back up of 
>those resolved files.

Look in your sandbox directories, I think cvs does a backup itself and
names them something like .#file.version.

bye  Fabi




_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Reply via email to