mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added a comment: The fact that the keys changed causes merge conflicts

Browse source
This commit is contained in:
https://www.google.com/accounts/o8/id?id=AItOawkjvjLHW9Omza7x1VEzIFQ8Z5honhRB90I 2012-06-25 00:29:02 +00:00 committed by admin
parent fbc16360d5
commit 4f04745c6b
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
doc/upgrades/SHA_size/comment_1_20f9b7b75786075de666b2146dc13a60._comment Normal file
View file

@ -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.
"""]]