diff options
Diffstat (limited to 'doc/forum/annex_merge_creates___34__synced__47____42____34___branches/comment_4_79219e920a6beb4bd3265571f59f51cb._comment')
| -rw-r--r-- | doc/forum/annex_merge_creates___34__synced__47____42____34___branches/comment_4_79219e920a6beb4bd3265571f59f51cb._comment | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/doc/forum/annex_merge_creates___34__synced__47____42____34___branches/comment_4_79219e920a6beb4bd3265571f59f51cb._comment b/doc/forum/annex_merge_creates___34__synced__47____42____34___branches/comment_4_79219e920a6beb4bd3265571f59f51cb._comment new file mode 100644 index 000000000..8e0764948 --- /dev/null +++ b/doc/forum/annex_merge_creates___34__synced__47____42____34___branches/comment_4_79219e920a6beb4bd3265571f59f51cb._comment @@ -0,0 +1,36 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawlog_5wIICaMcrKTexlFNA6IO6UTp323aE" + nickname="Torkaly" + subject="comment 4" + date="2014-09-19T18:22:36Z" + content=""" +delete the *synced/master* branch: +``` +$ git branch -d synced/master +Branch synced/master entfernt (war 20ec8b3). +``` + +then call *annex merge*: +``` +$ git annex merge +merge git-annex ok +``` + +check branches: +``` +$ git branch -a + git-annex +* master + synced/master + remotes/origin/git-annex + remotes/origin/master +``` +and there is the *synced/master* branch again. + +But that's not my problem. My problem was: how to use annex with a central repository. +I done that by deleting all remote synced/* branches. And now I'm updating the git-annex branch by `git fetch`ing and +`git annex merge`ing again. + +PS: the MD for code blocks is broken + +"""]] |