diff --git a/doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex/comment_1_95089f370e9645c0bfe18905c6c0ba05._comment b/doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex/comment_1_95089f370e9645c0bfe18905c6c0ba05._comment new file mode 100644 index 0000000000..443df6442d --- /dev/null +++ b/doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex/comment_1_95089f370e9645c0bfe18905c6c0ba05._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://sameer.sbuddhe.net/blog/" + nickname="sameerds" + subject="walkthrough should point to this tip" + date="2013-12-26T08:51:32Z" + content=""" +I recently started an attempt to migrate multiple existing directories to git annex. The [[walkthrough]] section on adding remotes gave me the impression that it was as simple as initializing a git annex on each copy and then just syncing them all up! The big surprise came when I attempted the sync and git complained about conflicts that it was attempting to merge. I had missed the most important point that these are all in fact git repositories, and you can't just fetch random unrelated git repositories into each other! + +This particular tip can save so much pain for newcomers like me, if only the walkthrough pointed out this situation. +"""]]