Menu
Hypothetically -- not that I did this -- let's say someone I know updated their working copy of a file, saw conflicts, hastily clicked "use theirs" then quickly marked as resolved...
Is there any way to undo that and get back the couple of hundred lines of code that I.. er... I mean someone lost...?
487
This file corresponds to the HEAD revision of the repository. You can either launch an external merge tool / conflict editor with TortoiseSVN → Edit Conflicts or you can use any text editor to resolve the conflict manually. You should decide what the code should look like, do the necessary changes and save the file.
Right click on the selected revision(s), then select Context Menu → Revert changes from this revision. Or if you want to make an earlier revision the new HEAD revision, right click on the selected revision, then select Context Menu → Revert to this revision. This will discard all changes after the selected revision.
svn resolve — Resolve conflicts on working copy files or directories.
Step 1: View Conflicts Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: Subversion is complaining that there is a conflict with the README file, and Subversion does not know how to solve this. So Jerry chooses the df option to review the conflict.
Maybe this may help other people that have a similar problem: we have this situation and we found the deleted file in the Recycle bin. We actually found the .mine and .theirs files and we were able to recover the changes
111
If you use Eclipse to write your code, right-click your file, go to Compare with and check Local history. Then you should see a list of local copies of the file with timestamps. If you double click any of them it will open it in compare mode where you can view it(and copy your lost work).
Similar IDEs might or might not have some kind of local versioning/backup.
38
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
