aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar https://www.google.com/accounts/o8/id?id=AItOawkjvjLHW9Omza7x1VEzIFQ8Z5honhRB90I <Asheesh@web>2012-06-25 00:29:02 +0000
committerGravatar admin <admin@branchable.com>2012-06-25 00:29:02 +0000
commit4f04745c6bbf9d82f238bf4745c28cd088cf1e8f (patch)
treec5fe160bfc984ab9b2912613c74ed43cc54f2c93
parentfbc16360d578517ebbef8aad1332877111370bfb (diff)
Added a comment: The fact that the keys changed causes merge conflicts
-rw-r--r--doc/upgrades/SHA_size/comment_1_20f9b7b75786075de666b2146dc13a60._comment12
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/upgrades/SHA_size/comment_1_20f9b7b75786075de666b2146dc13a60._comment b/doc/upgrades/SHA_size/comment_1_20f9b7b75786075de666b2146dc13a60._comment
new file mode 100644
index 000000000..7b6be1532
--- /dev/null
+++ b/doc/upgrades/SHA_size/comment_1_20f9b7b75786075de666b2146dc13a60._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkjvjLHW9Omza7x1VEzIFQ8Z5honhRB90I"
+ nickname="Asheesh"
+ subject="The fact that the keys changed causes merge conflicts"
+ date="2012-06-25T00:28:59Z"
+ content="""
+FYI, I have run into a problem where if you 'git annex sync' between various 'git annex v3' repositories, if the different repositories are using different encodings of the SHA1 information (one including size, one not), then the 'git merge' will declare that they conflict.
+
+There's no indication that 'git annex migrate' is the right tool to run, except from perusing the 'git annex' man page. In my opinion this is a major user interface problem.
+
+-- Asheesh.
+"""]]