summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/bugs/softlink_atime.mdwn2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/bugs/softlink_atime.mdwn b/doc/bugs/softlink_atime.mdwn
index ebb040dd1..0d26d1ce6 100644
--- a/doc/bugs/softlink_atime.mdwn
+++ b/doc/bugs/softlink_atime.mdwn
@@ -35,3 +35,5 @@ Optionally, editing the meta-data should change the times in all annexes.
git annex pre-commit .
metastore --save
git add .metadata
+
+>>>>>> Thanks a lot. Doing this in a new git-annex repo from the start should at least ensure local consistency and I assume I can simply add a post-pull hook to restore the mtimes on all all other repositories? -- RichiH