summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar https://www.google.com/accounts/o8/id?id=AItOawkutSE8_3fFAETmO_E598zja4gKwYXbb8E <@web>2015-04-08 12:31:34 +0000
committerGravatar admin <admin@branchable.com>2015-04-08 12:31:34 +0000
commitecbf19c7cf52037887fde91a3ff17c59891ef425 (patch)
tree2392a82a153e87a4a11199befbf18e0eb2f8e79d /doc
parent0e32bd184ced807c2716810fafae9e4a8a349ed6 (diff)
Added a comment
Diffstat (limited to 'doc')
-rw-r--r--doc/forum/Newb_question_on_sneekernet_sync/comment_1_409cc5ba605d63331b386066d32f797b._comment31
1 files changed, 31 insertions, 0 deletions
diff --git a/doc/forum/Newb_question_on_sneekernet_sync/comment_1_409cc5ba605d63331b386066d32f797b._comment b/doc/forum/Newb_question_on_sneekernet_sync/comment_1_409cc5ba605d63331b386066d32f797b._comment
new file mode 100644
index 000000000..691d40137
--- /dev/null
+++ b/doc/forum/Newb_question_on_sneekernet_sync/comment_1_409cc5ba605d63331b386066d32f797b._comment
@@ -0,0 +1,31 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkutSE8_3fFAETmO_E598zja4gKwYXbb8E"
+ nickname="Сергей"
+ subject="comment 1"
+ date="2015-04-08T12:31:33Z"
+ content="""
+Well, working with git annex, you should think of two things:
+
+1. location of annex information (git commit tree), let's call it INFO
+2. location of files contents, let's call it CONTENT
+
+So, for your sneekernet scenario these general steps are required:
+
+1. sync INFO between Laptop A and USB
+2. transfer required CONTENT from LAPTOP A to USB
+3. sync INFO between Laptop B and USB
+4. transfer required CONTENT from USB to Laptop B
+
+Let's describe your options on every step:
+
+1. issue `git annex sync` on Laptop A. Either from within USB or Laptop repo, I prefer Laptop because of automatic commit.
+2.
+ * issue `git annex copy <files> --to=<usb-remote-name>` from within Laptop A repo
+ * issue `git annex get <files>` from within USB repo. This is not possible if you have bare repo on USB.
+3. issue `git annex sync` on Laptop B
+4. same as 2, but transfer to Laptop B
+
+Also, using `git annex sync --content`, you don't need to manually transfer CONTENT, see [--content](https://git-annex.branchable.com/git-annex-sync/). But in this case you somewhat loose control of what is transferred.
+
+If you make changes on both laptops at the same time no extra steps required. In case of conflict both versions saved in working directory, see [automatic conflict resolution](http://git-annex.branchable.com/automatic_conflict_resolution/).
+"""]]