From 7f7a64dc9b83ff433320028de971a36fb0e3d0a3 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlog_5wIICaMcrKTexlFNA6IO6UTp323aE" Date: Wed, 17 Sep 2014 08:47:03 +0000 Subject: Added a comment --- .../comment_2_cb6971a766a28bd8c094d0b986272c65._comment | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/forum/annex_merge_creates___34__synced__47____42____34___branches/comment_2_cb6971a766a28bd8c094d0b986272c65._comment (limited to 'doc') diff --git a/doc/forum/annex_merge_creates___34__synced__47____42____34___branches/comment_2_cb6971a766a28bd8c094d0b986272c65._comment b/doc/forum/annex_merge_creates___34__synced__47____42____34___branches/comment_2_cb6971a766a28bd8c094d0b986272c65._comment new file mode 100644 index 000000000..5db94a7a0 --- /dev/null +++ b/doc/forum/annex_merge_creates___34__synced__47____42____34___branches/comment_2_cb6971a766a28bd8c094d0b986272c65._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawlog_5wIICaMcrKTexlFNA6IO6UTp323aE" + nickname="Torkaly" + subject="comment 2" + date="2014-09-17T08:47:03Z" + content=""" +Thank you for the answer. + +There are no origin/synced/* branches, only a origin/git-annex and the local git-annex branch. What i need git annex merge to do, is to merge the fetched remote git-annex with the local git-annex. There is no need for creating or merging the synced-branches as there are no. + +"""]] -- cgit v1.2.3