From 4fff42d79af4a0e3daa77fec6c9cc980da91c1f6 Mon Sep 17 00:00:00 2001 From: moaxey Date: Mon, 4 May 2020 21:50:05 +0000 Subject: [PATCH] --- doc/forum/How_to_fix_bad_merge.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/forum/How_to_fix_bad_merge.mdwn diff --git a/doc/forum/How_to_fix_bad_merge.mdwn b/doc/forum/How_to_fix_bad_merge.mdwn new file mode 100644 index 0000000000..48b7486104 --- /dev/null +++ b/doc/forum/How_to_fix_bad_merge.mdwn @@ -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?