|
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. Thanks in advance The information transmitted is intended only for the person or entity to whom it is addressed and may contain confidential and / or privileged Material. Any review, re-transmission, dissemination or other use of or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from your computer. Thank you for your understanding & co-operation. |
_______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
