diff --git a/doc/forum/ancient_linux_build_for_arm__63__/comment_1_c4ebfb2136bb4b3e21a52aa23717b22a._comment b/doc/forum/ancient_linux_build_for_arm__63__/comment_1_c4ebfb2136bb4b3e21a52aa23717b22a._comment new file mode 100644 index 0000000000..d2060ac53f --- /dev/null +++ b/doc/forum/ancient_linux_build_for_arm__63__/comment_1_c4ebfb2136bb4b3e21a52aa23717b22a._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="gb@4a49bb1afcf3d183bba8f07297b0395808768c6c" + nickname="gb" + avatar="http://cdn.libravatar.org/avatar/51ed40932fbf8748c70b31fd7446d40e" + subject="Is IA.BAK still active?" + date="2020-06-16T16:51:40Z" + content=""" +BTW, is INTERNETARCHIVE.BAK still active? + +The official page at https://www.archiveteam.org/index.php?title=INTERNETARCHIVE.BAK says + +> IA.BAK has been broken and unmaintained since about December 2016. The above status page () is not accurate as of December 2019. +"""]] diff --git a/doc/tips/android_sync_with_adb/comment_1_18e0b24a2907ba8df033454315e50212._comment b/doc/tips/android_sync_with_adb/comment_1_18e0b24a2907ba8df033454315e50212._comment new file mode 100644 index 0000000000..057a5d968d --- /dev/null +++ b/doc/tips/android_sync_with_adb/comment_1_18e0b24a2907ba8df033454315e50212._comment @@ -0,0 +1,37 @@ +[[!comment format=mdwn + username="https://dead-doomer.livejournal.com/" + subject=" How do I specify a merge command if I don't need separate branches?" + date="2020-06-16T16:17:48Z" + content=""" +>>If you want its files to not be in a subdirectory, set it to \"master\" instead. + +I did that. Than I issued: + +``` +git annex import master --from android +``` + +which downloaded a lot of files + +Then: +``` +git annex merge android/master +merge android/master +merge: android/master - not something we can merge +failed +git-annex: merge: 1 failed +``` + +I tried different combinations of android/master, ./master, master/. , but all seem to fail. + +plain git status shows a lot of non-added files for an \"initial commit\", and no files added. git annex status lists a lot of + +``` +? sdcard/bla +``` + +files. + +Any suggestions? + +"""]] diff --git a/doc/tips/android_sync_with_adb/comment_2_68affd1a753abdeca0f161698cc63413._comment b/doc/tips/android_sync_with_adb/comment_2_68affd1a753abdeca0f161698cc63413._comment new file mode 100644 index 0000000000..0f1c960c68 --- /dev/null +++ b/doc/tips/android_sync_with_adb/comment_2_68affd1a753abdeca0f161698cc63413._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="https://dead-doomer.livejournal.com/" + subject="comment 2" + date="2020-06-16T16:31:32Z" + content=""" +At which point should I do ordinary git commits? + +So far the repo has been at just the \"Initial commit\" + +"""]]