diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-12-11 18:04:40 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-12-11 18:04:40 -0400 |
| commit | af4afd17a1b51e609adc560edb5faa4a93c0b140 (patch) | |
| tree | 8a4a0c6bc7e1c3843583aa2ef2350bf4f4ce9f3d /doc | |
| parent | f1fb76c73e017d83eaf1c7dddea39cfa78b7c27a (diff) | |
| parent | 2b7a10f231bba84015b621dc358d63412a537678 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc')
2 files changed, 34 insertions, 0 deletions
diff --git a/doc/bugs/Android:_no___34____47__etc__47__resolv.conf__34___when_submitting_jabber_user_and_password..mdwn b/doc/bugs/Android:_no___34____47__etc__47__resolv.conf__34___when_submitting_jabber_user_and_password..mdwn new file mode 100644 index 000000000..2081a5e96 --- /dev/null +++ b/doc/bugs/Android:_no___34____47__etc__47__resolv.conf__34___when_submitting_jabber_user_and_password..mdwn @@ -0,0 +1,17 @@ +### Please describe the problem. + +I get this error when configuring jabber: + +/etc/resolv.conf: openFile: does not exist (No such file or directory) + +### What steps will reproduce the problem? + +Just submit the jabber username and password. + +### What version of git-annex are you using? On what operating system? + +$ git annex version +git-annex version: 5.20131130-gc25be33 +build flags: Assistant Webapp Testsuite S3 WebDAV Inotify XMPP DNS Feeds Quvi TDFA CryptoHash +key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL +remote types: git gcrypt S3 bup directory rsync web webdav glacier hook diff --git a/doc/forum/Can_Not_Sync_to_Git_Repo/comment_6_10e114da6a2bb54b860b44767ba1ca94._comment b/doc/forum/Can_Not_Sync_to_Git_Repo/comment_6_10e114da6a2bb54b860b44767ba1ca94._comment new file mode 100644 index 000000000..b605de726 --- /dev/null +++ b/doc/forum/Can_Not_Sync_to_Git_Repo/comment_6_10e114da6a2bb54b860b44767ba1ca94._comment @@ -0,0 +1,17 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawniayrgSdVLUc3c6bf93VbO-_HT4hzxmyo" + nickname="Tobias" + subject="same here" + date="2013-12-11T19:57:09Z" + content=""" +I'm facing the same situation as the other commenters. + + git-annex version: 5.20131130-gc25be33 + [...] + (merging gitlab/synced/git-annex into git-annex...) + (Recording state in git...) + fatal: Cannot force update the current branch. + git-annex: failed to update refs/heads/master + +Seems to be a problem with the command `git branch -f master` +"""]] |