mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
moaxey 2020-05-04 21:50:05 +00:00 committed by admin
parent a5830c3f6e
commit 4fff42d79a
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
doc/forum/How_to_fix_bad_merge.mdwn Normal file
View file

@ -0,0 +1,7 @@
I stuffed up the [android_sync_with_adb instructions](https://git-annex.branchable.com/tips/android_sync_with_adb) and not for the first time, ending up with everything deleted from my annex except what was on my phone.
I think I previously fixed it with a 'git reset --hard' however this time it has spread to all my annexes. And every time I sync the wrong situation is restored.
I know I haven't lost any files, but how can I get the symlinks back the way they were?
What branches do I need to reset on which repositories?