response and close

diff --git a/doc/bugs/gets_confused_files_synchronized_out_of_band.mdwn b/doc/bugs/gets_confused_files_synchronized_out_of_band.mdwn
index f096a46c2923166a5c3fd059939018e130e1beb1..ce501c96cb44a100183ce2746313f77dd22acd8d 100644 (file)
--- a/doc/bugs/gets_confused_files_synchronized_out_of_band.mdwn
+++ b/doc/bugs/gets_confused_files_synchronized_out_of_band.mdwn
@@ -204,3 +204,5 @@ push origin ok
 ### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
 
 I am a total fan, thanks for your awesome work, as usual. ;) -- [[anarcat]]
+
+> [[notabug|done]] --[[Joey]]

diff --git a/doc/bugs/gets_confused_files_synchronized_out_of_band/comment_1_a8f081ee9a5ad8c45dcdf66cea368463._comment b/doc/bugs/gets_confused_files_synchronized_out_of_band/comment_1_a8f081ee9a5ad8c45dcdf66cea368463._comment
new file mode 100644 (file)
index 0000000..ca3c4c2
--- /dev/null
+++ b/doc/bugs/gets_confused_files_synchronized_out_of_band/comment_1_a8f081ee9a5ad8c45dcdf66cea368463._comment
@@ -0,0 +1,36 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2021-09-08T15:56:35Z"
+ content="""
+The french output is by git, not git-annex. It looks like the standard
+message about there being a merge conflict. One part of the git
+output is not translated and it happens to be the part that explains
+what is going on.
+
+       warning: Cannot merge binary files: metadata.db (HEAD vs. refs/remotes/origin/master)
+
+So metadata.db is a binary file, so it is not stored in git-annex,
+but is checked directly into git. Or at least it is on one side of
+the merge conflict.
+
+I think that one repository added metadata.db to git-annex, and the other
+added it to directly into git. So then the merge conflict is between
+the binary content of the file and the git-annex symlink. Which is an
+actual merge conflict, even though the content of the file is the same.
+
+That kind of merge conflict is when `git-annex sync` resolves the merge
+conflict with a single `.variant` file for the annexed version along side the
+regular file as stored in git. Which is what your ls showed. 
+You can resolve the merge conflict by either deleting the annexed
+ `.variant` file or renaming it over the file stored in git.
+
+You can avoid this kind of merge conflict by configuring annex.largefiles
+the same in both repositories, so when a file like metadata.db gets added
+separately in each repository, the same annex link will be added.
+
+Or you can set annex.resolvemerge to false for sync to avoid resolving merge
+conflicts, and then just resolve them yourself.
+
+I don't see a bug here, this is all documented.
+"""]]