File: How_to_fix_bad_merge.mdwn

package info (click to toggle)
git-annex 10.20230126-3
  • links: PTS, VCS
  • area: main
  • in suites: bookworm
  • size: 69,344 kB
  • sloc: haskell: 74,654; javascript: 9,103; sh: 1,304; makefile: 203; perl: 136; ansic: 44
file content (7 lines) | stat: -rw-r--r-- 529 bytes parent folder | download | duplicates (5)
1
2
3
4
5
6
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?