diff options
| author |  https://www.google.com/accounts/o8/id?id=AItOawlM_DRhi_5pJrTA0HbApHR25iAgy-NBXTY <Tor_Arne@web> | 2014-10-14 22:09:37 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2014-10-14 22:09:37 +0000 |
| commit | f54671a4ed30409b055efed3e414a56c9477c220 (patch) | |
| tree | 42bf348ffbe08f050e25801d7d85fc283742e73a | |
| parent | 7e1de77a186e87f46334bedee1428f9b7224e297 (diff) | |
Added a comment
| -rw-r--r-- | doc/forum/multiple_git_repositories_inside_git_annex_assistant_repository/comment_4_4e89b3590cc33b2565cd173ef7c85013._comment | 11 |
1 files changed, 11 insertions, 0 deletions
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? + +"""]] |