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

Added a comment: How do I specify a merge command if I don't need separate branches?

Browse source
This commit is contained in:
https://dead-doomer.livejournal.com/ 2020-06-16 16:11:30 +00:00 committed by admin
parent 6dac582f06
commit d370aff8dc
1 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
doc/tips/android_sync_with_adb/comment_1_8fd44c93bf7997452907f69a076ebc81._comment Normal file
View file

@ -0,0 +1,33 @@
[[!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:11:30Z"
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?
"""]]