Reputation: 9621
After getting latest, I was asked to perform merge on a file.
By mistake I clicked on 'take server version', is it possible to get my data back?
Upvotes: 3
Views: 2410
Reputation: 4772
Yes, there is chance to get your data back (which I obviously assume that you managed to live without them as it's been more than 3 years since you first asked the question)
Upvotes: 1
Reputation: 4249
If you use "Take server version", that means your file, that was until then only on your local computer is now overwritten. So unless you have your file saved in another place, your changes are lost.
If you merged only conflicting changes, then other changes (that were not conflicting with server version) are still in your local file.
Upvotes: 0