From f54671a4ed30409b055efed3e414a56c9477c220 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlM_DRhi_5pJrTA0HbApHR25iAgy-NBXTY" Date: Tue, 14 Oct 2014 22:09:37 +0000 Subject: Added a comment --- .../comment_4_4e89b3590cc33b2565cd173ef7c85013._comment | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/forum/multiple_git_repositories_inside_git_annex_assistant_repository/comment_4_4e89b3590cc33b2565cd173ef7c85013._comment diff --git a/doc/forum/multiple_git_repositories_inside_git_annex_assistant_repository/comment_4_4e89b3590cc33b2565cd173ef7c85013._comment b/doc/forum/multiple_git_repositories_inside_git_annex_assistant_repository/comment_4_4e89b3590cc33b2565cd173ef7c85013._comment new file mode 100644 index 000000000..b32abd3ec --- /dev/null +++ b/doc/forum/multiple_git_repositories_inside_git_annex_assistant_repository/comment_4_4e89b3590cc33b2565cd173ef7c85013._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawlM_DRhi_5pJrTA0HbApHR25iAgy-NBXTY" + nickname="Tor Arne" + subject="comment 4" + date="2014-10-14T22:09:37Z" + content=""" +If I use git-annex to keep my home and work computer in sync, the conflict would only happen if I somehow manage to make a change in the git repo on one machine that's not propagated to the other straight away (eg, network down), and I then modify the git repo of the other as well? + +Could git-annex have a different merge strategy in this case, not try to merge anything under .git and give a warning? + +"""]] -- cgit v1.2.3 From 2588f3fb2c4b41da94a2bcc6f24412548d131c06 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlM_DRhi_5pJrTA0HbApHR25iAgy-NBXTY" Date: Tue, 14 Oct 2014 22:13:44 +0000 Subject: Added a comment --- .../comment_2_e96e8cf6e08e3a21bfcefbc202e78fe2._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/how_to_set_up_syncing_for_multiple_computer_and_a_centralized_backup_unit/comment_2_e96e8cf6e08e3a21bfcefbc202e78fe2._comment diff --git a/doc/forum/how_to_set_up_syncing_for_multiple_computer_and_a_centralized_backup_unit/comment_2_e96e8cf6e08e3a21bfcefbc202e78fe2._comment b/doc/forum/how_to_set_up_syncing_for_multiple_computer_and_a_centralized_backup_unit/comment_2_e96e8cf6e08e3a21bfcefbc202e78fe2._comment new file mode 100644 index 000000000..fa0f49120 --- /dev/null +++ b/doc/forum/how_to_set_up_syncing_for_multiple_computer_and_a_centralized_backup_unit/comment_2_e96e8cf6e08e3a21bfcefbc202e78fe2._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawlM_DRhi_5pJrTA0HbApHR25iAgy-NBXTY" + nickname="Tor Arne" + subject="comment 2" + date="2014-10-14T22:13:44Z" + content=""" +Did you figure this one out? +"""]] -- cgit v1.2.3