diff options
author | http://joeyh.name/ <http://joeyh.name/@web> | 2012-07-26 17:27:39 +0000 |
---|---|---|
committer | admin <admin@branchable.com> | 2012-07-26 17:27:39 +0000 |
commit | f0e683bbd4ae5c7a2e29c44f140f826d5865e1cf (patch) | |
tree | 27da1a757d691b4f0f53210103b857f7d5749661 /doc | |
parent | 8c3491f50c84059c765811a9c80a6db29c53d978 (diff) |
Added a comment
Diffstat (limited to 'doc')
-rw-r--r-- | doc/design/assistant/blog/day_16__more_robust_syncing/comment_2_8e7e7cd27791bb47625e60a284e9c802._comment | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/design/assistant/blog/day_16__more_robust_syncing/comment_2_8e7e7cd27791bb47625e60a284e9c802._comment b/doc/design/assistant/blog/day_16__more_robust_syncing/comment_2_8e7e7cd27791bb47625e60a284e9c802._comment new file mode 100644 index 000000000..e47b03d48 --- /dev/null +++ b/doc/design/assistant/blog/day_16__more_robust_syncing/comment_2_8e7e7cd27791bb47625e60a284e9c802._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.153.2.189" + subject="comment 2" + date="2012-07-26T17:27:39Z" + content=""" +That's a good question. Unfortunatly they cannot; X and Y need to be stable across repositories, and git remotes can have different names in different repositories. + +Even using the description that git-annex stores for each repository for X and Y is problimatic, since that description can change, and so could be different in two repos that are each trying to resolve the same merge conflict. +"""]] |