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

3 files changed, 38 insertions, 0 deletions

diff --git a/doc/devblog/day_468__export_renames/comment_1_4c37e6f9ac1e1571495b0d355c8af9ff._comment b/doc/devblog/day_468__export_renames/comment_1_4c37e6f9ac1e1571495b0d355c8af9ff._comment
new file mode 100644
index 000000000..b9bc07ee4
--- /dev/null
+++ b/doc/devblog/day_468__export_renames/comment_1_4c37e6f9ac1e1571495b0d355c8af9ff._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="anthony@ad39673d230d75cbfd19d2757d754030049c7673"
+ nickname="anthony"
+ avatar="http://cdn.libravatar.org/avatar/05b48b72766177b3b0a6ff4afdb70790"
+ subject="comment 1"
+ date="2017-09-06T22:01:57Z"
+ content="""
+Looking forward to the export support! 
+
+Just curious (and I apologize in advance for any nightmares induced) did you consider the case of four files, A–D, where (content-wise) A=B and C=D and the change is to swap A/C and B/D? That'd potentially be an issue, since four files want to share two temporary names. Unless of course it's all only done with pairwise swaps.
+"""]]
diff --git a/doc/forum/Is_there_a_way_to_unannex_some_file___63__/comment_1_82095cef37dd815bcd1d101a1715e3c7._comment b/doc/forum/Is_there_a_way_to_unannex_some_file___63__/comment_1_82095cef37dd815bcd1d101a1715e3c7._comment
new file mode 100644
index 000000000..0f87f1460
--- /dev/null
+++ b/doc/forum/Is_there_a_way_to_unannex_some_file___63__/comment_1_82095cef37dd815bcd1d101a1715e3c7._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="Horus"
+ avatar="http://cdn.libravatar.org/avatar/8f0ee08b98ea5bba76c3fe112c08851c"
+ subject="comment 1"
+ date="2017-09-07T09:30:53Z"
+ content="""
+Well, there is ```git unannex ...``` 
+
+<https://git-annex.branchable.com/git-annex-unannex/>
+
+Is that what you're looking for?
+"""]]
diff --git a/doc/forum/Shared_directory_with_non_git-annex_users.mdwn b/doc/forum/Shared_directory_with_non_git-annex_users.mdwn
new file mode 100644
index 000000000..b6e9d5aaa
--- /dev/null
+++ b/doc/forum/Shared_directory_with_non_git-annex_users.mdwn
@@ -0,0 +1,15 @@
+Hello,
+
+I want to use git-annex on a directory that also other persons, without git-annex use, i.e. modify, add and remove files to.
+
+What need I consider when doing that?
+
+ * Use indirect mode
+ * The the .git directory somewhere else?
+ * Be prepared that a ```git annex get``` can always bring up checksum problems because someone modified the file
+
+I assume git-annex checksums before pushing to the repo, so that I don't otherwrite someone elses changes.
+
+What else?
+
+Thanks!