forum/Several lines for one remote in remote.loggit-annexhttp://git-annex.branchable.com/forum/Several_lines_for_one_remote_in_remote.log/git-annexikiwiki2019-05-06T17:58:42Zformat of log files on the git-annex branchhttp://git-annex.branchable.com/forum/Several_lines_for_one_remote_in_remote.log/comment_1_fdfb0099924f19fcbf334498d31f1656/Ilya_Shlyakhter2019-04-30T17:52:41Z2019-04-30T17:52:41Z
I think only the line with the latest timestamp matters; this format lets <a href="http://git-annex.branchable.com/git-annex-sync/">git-annex-sync</a> resolve merge conflicts on the git-annex branch by simply merging the set of lines in the two files. The <a href="http://git-annex.branchable.com/internals/">internals</a> webpage does refer repeatedly to "one line per repository". @joeyh can you clarify?
comment 2http://git-annex.branchable.com/forum/Several_lines_for_one_remote_in_remote.log/comment_2_f45a9c92de2d0271e6a427810794b0e4/joey2019-05-06T17:58:42Z2019-05-06T16:24:25Z
Only the most recent line is used.