Merge branch 'master' of ssh://git-annex.branchable.com

3 files changed, 29 insertions, 0 deletions

diff --git a/doc/forum/Hashes_instead_of_content_in_files/comment_2_a111296eecf7d69ff30f6a82e9f1e6d4._comment b/doc/forum/Hashes_instead_of_content_in_files/comment_2_a111296eecf7d69ff30f6a82e9f1e6d4._comment
new file mode 100644
index 000000000..d9f4d5d0d
--- /dev/null
+++ b/doc/forum/Hashes_instead_of_content_in_files/comment_2_a111296eecf7d69ff30f6a82e9f1e6d4._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="Adam000"
+ subject="comment 2"
+ date="2016-09-15T15:57:59Z"
+ content="""
+Linux boxes. The repository is v6 and has files unlocked. I like to have my files unlocked so I can edit them. Is there a way to keep them unlocked, but transfer the real file content? Or, edit, then, as a batch operation, lock, sync, unlock?
+"""]]
diff --git a/doc/forum/Hashes_instead_of_content_in_files/comment_3_574964b83563df3afea9049754b1cfa2._comment b/doc/forum/Hashes_instead_of_content_in_files/comment_3_574964b83563df3afea9049754b1cfa2._comment
new file mode 100644
index 000000000..9f2b988f1
--- /dev/null
+++ b/doc/forum/Hashes_instead_of_content_in_files/comment_3_574964b83563df3afea9049754b1cfa2._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="Adam000"
+ subject="comment 3"
+ date="2016-09-15T16:03:42Z"
+ content="""
+Locking the files in the first repo did the trick. Ideally a solution is available permitting transfer of unlocked files.
+"""]]
diff --git a/doc/todo/Workflow_guide.mdwn b/doc/todo/Workflow_guide.mdwn
new file mode 100644
index 000000000..5cc971b13
--- /dev/null
+++ b/doc/todo/Workflow_guide.mdwn
@@ -0,0 +1,15 @@
+I try to use git annex, but I frequently don't know if I'm doing things correctly, and my files are getting messed up.
+
+An expert guide to the full workflow would go a long way toward user-friendliness for me. The walkthrough currently has guides to a number discrete items in the workflow, but it doesn't give me a clear sense of the process.
+
+I'm always confused about when I'm supposed to be using pure git commands and when they should be git annex commands, when to commit, add, and sync --content, and when each of these is redundant.
+
+If possible, most helpful would be a guide to how you imagine the workflow from the beginning and including each step of the process, in the order you'd do it.
+
+I want to start keeping track of some files I have in a directory
+I want to copy them to a second computer.
+From a third place, I want to get them from the second computer.
+I change the files on one computer, and I want to make sure the changes get synced to the others.
+What are the commands you'd run at each step?
+
+Many thanks.