Ramanuj Singh wrote: > 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. Unfortunately, no. However, if the file had actually been modified, then CVS would *not* have overwritten your changes.
In any case, CVS will have saved a copy of the pre-merged file in your working directory. Look for a file with the same name, but with ".#" prefixed, and the version number appended. For example, if you were working on rev 1.4 of file myfile.cpp your local directory will hold a file named .#myfile.cpp.1.4 -- Jim Hyslop Senior Software Designer Leitch Technology International Inc. (http://www.leitch.com) Columnist, C/C++ Users Journal (http://www.cuj.com/experts) _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
