Hello,
I have a repo Desktop (client), a repo Server (transfer) and a repo Notebook (Client). Usually first thing I do in the morning is go git annex sync --content the changes to the laptop. Today I accidently modified some files on the laptop before I synced. After I syncing I know have some files foo.variant-afd1 and foo.variant-a6d3 with which I don't know what to do.
How can I discard local changes and copy all changes from the transfer repo to the laptop? Local changes should be overwritten.
Thanks!
Sorry that nobody answered your question until now..
These .variant files preserve both versions of the files that were committed in the two different repositories. If you can identify which variant you don't want, you can just delete that one, and rename the other .variant file back to the original file name.
There's no really great way to tell which variant is which. I'd look at the contents of the variants of the file, unless there are too many files to look at.
Another approach is to look at the git log, find the commit that merged the unwanted changed (and created these variant files), and
git revertthat merge, and the earlier commit that was made accidentally.