From 59922f1f45d09d955daa78223ff1773d19c571af Mon Sep 17 00:00:00 2001 From: Ilya_Shlyakhter Date: Tue, 30 Apr 2019 17:52:41 +0000 Subject: [PATCH] Added a comment: format of log files on the git-annex branch --- .../comment_1_fdfb0099924f19fcbf334498d31f1656._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Several_lines_for_one_remote_in_remote.log/comment_1_fdfb0099924f19fcbf334498d31f1656._comment diff --git a/doc/forum/Several_lines_for_one_remote_in_remote.log/comment_1_fdfb0099924f19fcbf334498d31f1656._comment b/doc/forum/Several_lines_for_one_remote_in_remote.log/comment_1_fdfb0099924f19fcbf334498d31f1656._comment new file mode 100644 index 0000000000..9c1b709c26 --- /dev/null +++ b/doc/forum/Several_lines_for_one_remote_in_remote.log/comment_1_fdfb0099924f19fcbf334498d31f1656._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="Ilya_Shlyakhter" + avatar="http://cdn.libravatar.org/avatar/1647044369aa7747829c38b9dcc84df0" + subject="format of log files on the git-annex branch" + date="2019-04-30T17:52:41Z" + content=""" +I think only the line with the latest timestamp matters; this format lets [[git-annex-sync]] resolve merge conflicts on the git-annex branch by simply merging the set of lines in the two files. The [[internals]] webpage does refer repeatedly to \"one line per repository\". @joeyh can you clarify? +"""]]