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

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2018-11-05 14:39:18 -04:00
commit 3c50fa130c
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
doc/bugs/Can__39__t_add_remotes_through_the_web_assistant/comment_10_528d06a5299104cc17d0b1835fb74118._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="marvin@3296bf3c446430c3b2ebc32b5c784ee976620847"
nickname="marvin"
avatar="http://cdn.libravatar.org/avatar/a07e2adf7ff40bdd4c3fe20ededc0a4e"
subject="comment 10"
date="2018-11-05T18:22:49Z"
content="""
thank you for fixing this bug. you do such a great job and we couldnt be more thankful for your code....
"""]]

9
doc/forum/assistant_to_have_synced_folders/comment_4_53ceb18128de33311d65b39f34b3d9b7._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="marvin@3296bf3c446430c3b2ebc32b5c784ee976620847"
nickname="marvin"
avatar="http://cdn.libravatar.org/avatar/a07e2adf7ff40bdd4c3fe20ededc0a4e"
subject="comment 4"
date="2018-11-05T18:21:53Z"
content="""
i did all the steps you described. not even on my local box... two repos... assistant running on both repos (checked out repos with workdir)... processes run fine. i add files to repo A. it gets tranfered to repo B. the assistant on repo B does not merge. maybe thee post-receive hook is not working. as i thought it would merge with the synced branch in a auto way. i always have to run git annex sync do get the new files or repo A in repo B. i know you can set something up with \"git config receive.denyCurrentBranch updateInstead\". but i thought if i set something up with the assistant this would do this out of the box. or i have a thinking error. do i need a pushing tranfer repo in the middle connected with tor to get this done? i thought it would be more easy. but if i dont even get this working local.... i have no idea where my error is. if its something technical or in my understanding.
"""]]